Skip to content

Commit a5ffabc

Browse files
authored
[llvm][Support] Add UNIX socket support (#73603)
This adds support for UNIX socket communication to work similarly to raw_stream. --------- Patch by Christian Riis
1 parent 6d18951 commit a5ffabc

File tree

5 files changed

+262
-2
lines changed

5 files changed

+262
-2
lines changed

llvm/include/llvm/Support/raw_ostream.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/ADT/SmallVector.h"
1717
#include "llvm/ADT/StringRef.h"
1818
#include "llvm/Support/DataTypes.h"
19+
#include "llvm/Support/Threading.h"
1920
#include <cassert>
2021
#include <cstddef>
2122
#include <cstdint>
@@ -615,6 +616,8 @@ class raw_fd_stream : public raw_fd_ostream {
615616
/// immediately destroyed.
616617
raw_fd_stream(StringRef Filename, std::error_code &EC);
617618

619+
raw_fd_stream(int fd, bool shouldClose);
620+
618621
/// This reads the \p Size bytes into a buffer pointed by \p Ptr.
619622
///
620623
/// \param Ptr The start of the buffer to hold data to be read.
@@ -630,6 +633,54 @@ class raw_fd_stream : public raw_fd_ostream {
630633
static bool classof(const raw_ostream *OS);
631634
};
632635

636+
//===----------------------------------------------------------------------===//
637+
// Socket Streams
638+
//===----------------------------------------------------------------------===//
639+
640+
/// A raw stream for sockets reading/writing
641+
642+
class raw_socket_stream;
643+
644+
// Make sure that calls to WSAStartup and WSACleanup are balanced.
645+
#ifdef _WIN32
646+
class WSABalancer {
647+
public:
648+
WSABalancer();
649+
~WSABalancer();
650+
};
651+
#endif // _WIN32
652+
653+
class ListeningSocket {
654+
int FD;
655+
std::string SocketPath;
656+
ListeningSocket(int SocketFD, StringRef SocketPath);
657+
#ifdef _WIN32
658+
WSABalancer _;
659+
#endif // _WIN32
660+
661+
public:
662+
static Expected<ListeningSocket> createUnix(
663+
StringRef SocketPath,
664+
int MaxBacklog = llvm::hardware_concurrency().compute_thread_count());
665+
Expected<std::unique_ptr<raw_socket_stream>> accept();
666+
ListeningSocket(ListeningSocket &&LS);
667+
~ListeningSocket();
668+
};
669+
class raw_socket_stream : public raw_fd_stream {
670+
uint64_t current_pos() const override { return 0; }
671+
#ifdef _WIN32
672+
WSABalancer _;
673+
#endif // _WIN32
674+
675+
public:
676+
raw_socket_stream(int SocketFD);
677+
/// Create a \p raw_socket_stream connected to the Unix domain socket at \p
678+
/// SocketPath.
679+
static Expected<std::unique_ptr<raw_socket_stream>>
680+
createConnectedUnix(StringRef SocketPath);
681+
~raw_socket_stream();
682+
};
683+
633684
//===----------------------------------------------------------------------===//
634685
// Output Stream Adaptors
635686
//===----------------------------------------------------------------------===//

llvm/lib/Support/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ endif()
4040
if( MSVC OR MINGW )
4141
# libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
4242
# advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
43-
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32)
43+
set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 Ws2_32)
4444
elseif( CMAKE_HOST_UNIX )
4545
if( HAVE_LIBRT )
4646
set(system_libs ${system_libs} rt)

llvm/lib/Support/raw_ostream.cpp

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "llvm/Support/AutoConvert.h"
1717
#include "llvm/Support/Compiler.h"
1818
#include "llvm/Support/Duration.h"
19+
#include "llvm/Support/Error.h"
1920
#include "llvm/Support/ErrorHandling.h"
2021
#include "llvm/Support/FileSystem.h"
2122
#include "llvm/Support/Format.h"
@@ -24,11 +25,17 @@
2425
#include "llvm/Support/NativeFormatting.h"
2526
#include "llvm/Support/Process.h"
2627
#include "llvm/Support/Program.h"
28+
#include "llvm/Support/Threading.h"
2729
#include <algorithm>
2830
#include <cerrno>
2931
#include <cstdio>
3032
#include <sys/stat.h>
3133

34+
#ifndef _WIN32
35+
#include <sys/socket.h>
36+
#include <sys/un.h>
37+
#endif // _WIN32
38+
3239
// <fcntl.h> may provide O_BINARY.
3340
#if defined(HAVE_FCNTL_H)
3441
# include <fcntl.h>
@@ -59,6 +66,13 @@
5966
#include "llvm/Support/ConvertUTF.h"
6067
#include "llvm/Support/Signals.h"
6168
#include "llvm/Support/Windows/WindowsSupport.h"
69+
// winsock2.h must be included before afunix.h. Briefly turn off clang-format to
70+
// avoid error.
71+
// clang-format off
72+
#include <winsock2.h>
73+
#include <afunix.h>
74+
// clang-format on
75+
#include <io.h>
6276
#endif
6377

6478
using namespace llvm;
@@ -645,7 +659,7 @@ raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered,
645659
// Check if this is a console device. This is not equivalent to isatty.
646660
IsWindowsConsole =
647661
::GetFileType((HANDLE)::_get_osfhandle(fd)) == FILE_TYPE_CHAR;
648-
#endif
662+
#endif // _WIN32
649663

650664
// Get the starting position.
651665
off_t loc = ::lseek(FD, 0, SEEK_CUR);
@@ -937,6 +951,9 @@ raw_fd_stream::raw_fd_stream(StringRef Filename, std::error_code &EC)
937951
EC = std::make_error_code(std::errc::invalid_argument);
938952
}
939953

954+
raw_fd_stream::raw_fd_stream(int fd, bool shouldClose)
955+
: raw_fd_ostream(fd, shouldClose, false, OStreamKind::OK_FDStream) {}
956+
940957
ssize_t raw_fd_stream::read(char *Ptr, size_t Size) {
941958
assert(get_fd() >= 0 && "File already closed.");
942959
ssize_t Ret = ::read(get_fd(), (void *)Ptr, Size);
@@ -951,6 +968,145 @@ bool raw_fd_stream::classof(const raw_ostream *OS) {
951968
return OS->get_kind() == OStreamKind::OK_FDStream;
952969
}
953970

971+
//===----------------------------------------------------------------------===//
972+
// raw_socket_stream
973+
//===----------------------------------------------------------------------===//
974+
975+
#ifdef _WIN32
976+
WSABalancer::WSABalancer() {
977+
WSADATA WsaData = {0};
978+
if (WSAStartup(MAKEWORD(2, 2), &WsaData) != 0) {
979+
llvm::report_fatal_error("WSAStartup failed");
980+
}
981+
}
982+
983+
WSABalancer::~WSABalancer() { WSACleanup(); }
984+
985+
#endif // _WIN32
986+
987+
static std::error_code getLastSocketErrorCode() {
988+
#ifdef _WIN32
989+
return std::error_code(::WSAGetLastError(), std::system_category());
990+
#else
991+
return std::error_code(errno, std::system_category());
992+
#endif
993+
}
994+
995+
ListeningSocket::ListeningSocket(int SocketFD, StringRef SocketPath)
996+
: FD(SocketFD), SocketPath(SocketPath) {}
997+
998+
ListeningSocket::ListeningSocket(ListeningSocket &&LS)
999+
: FD(LS.FD), SocketPath(LS.SocketPath) {
1000+
LS.FD = -1;
1001+
}
1002+
1003+
Expected<ListeningSocket> ListeningSocket::createUnix(StringRef SocketPath,
1004+
int MaxBacklog) {
1005+
1006+
#ifdef _WIN32
1007+
WSABalancer _;
1008+
SOCKET MaybeWinsocket = socket(AF_UNIX, SOCK_STREAM, 0);
1009+
if (MaybeWinsocket == INVALID_SOCKET) {
1010+
#else
1011+
int MaybeWinsocket = socket(AF_UNIX, SOCK_STREAM, 0);
1012+
if (MaybeWinsocket == -1) {
1013+
#endif
1014+
return llvm::make_error<StringError>(getLastSocketErrorCode(),
1015+
"socket create failed");
1016+
}
1017+
1018+
struct sockaddr_un Addr;
1019+
memset(&Addr, 0, sizeof(Addr));
1020+
Addr.sun_family = AF_UNIX;
1021+
strncpy(Addr.sun_path, SocketPath.str().c_str(), sizeof(Addr.sun_path) - 1);
1022+
1023+
if (bind(MaybeWinsocket, (struct sockaddr *)&Addr, sizeof(Addr)) == -1) {
1024+
std::error_code Err = getLastSocketErrorCode();
1025+
if (Err == std::errc::address_in_use)
1026+
::close(MaybeWinsocket);
1027+
return llvm::make_error<StringError>(Err, "Bind error");
1028+
}
1029+
if (listen(MaybeWinsocket, MaxBacklog) == -1) {
1030+
return llvm::make_error<StringError>(getLastSocketErrorCode(),
1031+
"Listen error");
1032+
}
1033+
int UnixSocket;
1034+
#ifdef _WIN32
1035+
UnixSocket = _open_osfhandle(MaybeWinsocket, 0);
1036+
#else
1037+
UnixSocket = MaybeWinsocket;
1038+
#endif // _WIN32
1039+
ListeningSocket ListenSocket(UnixSocket, SocketPath);
1040+
return ListenSocket;
1041+
}
1042+
1043+
Expected<std::unique_ptr<raw_socket_stream>> ListeningSocket::accept() {
1044+
int AcceptFD;
1045+
#ifdef _WIN32
1046+
SOCKET WinServerSock = _get_osfhandle(FD);
1047+
SOCKET WinAcceptSock = ::accept(WinServerSock, NULL, NULL);
1048+
AcceptFD = _open_osfhandle(WinAcceptSock, 0);
1049+
#else
1050+
AcceptFD = ::accept(FD, NULL, NULL);
1051+
#endif //_WIN32
1052+
if (AcceptFD == -1)
1053+
return llvm::make_error<StringError>(getLastSocketErrorCode(),
1054+
"Accept failed");
1055+
return std::make_unique<raw_socket_stream>(AcceptFD);
1056+
}
1057+
1058+
ListeningSocket::~ListeningSocket() {
1059+
if (FD == -1)
1060+
return;
1061+
::close(FD);
1062+
unlink(SocketPath.c_str());
1063+
}
1064+
1065+
static Expected<int> GetSocketFD(StringRef SocketPath) {
1066+
#ifdef _WIN32
1067+
SOCKET MaybeWinsocket = socket(AF_UNIX, SOCK_STREAM, 0);
1068+
if (MaybeWinsocket == INVALID_SOCKET) {
1069+
#else
1070+
int MaybeWinsocket = socket(AF_UNIX, SOCK_STREAM, 0);
1071+
if (MaybeWinsocket == -1) {
1072+
#endif // _WIN32
1073+
return llvm::make_error<StringError>(getLastSocketErrorCode(),
1074+
"Create socket failed");
1075+
}
1076+
1077+
struct sockaddr_un Addr;
1078+
memset(&Addr, 0, sizeof(Addr));
1079+
Addr.sun_family = AF_UNIX;
1080+
strncpy(Addr.sun_path, SocketPath.str().c_str(), sizeof(Addr.sun_path) - 1);
1081+
1082+
int status = connect(MaybeWinsocket, (struct sockaddr *)&Addr, sizeof(Addr));
1083+
if (status == -1) {
1084+
return llvm::make_error<StringError>(getLastSocketErrorCode(),
1085+
"Connect socket failed");
1086+
}
1087+
#ifdef _WIN32
1088+
return _open_osfhandle(MaybeWinsocket, 0);
1089+
#else
1090+
return MaybeWinsocket;
1091+
#endif // _WIN32
1092+
}
1093+
1094+
raw_socket_stream::raw_socket_stream(int SocketFD)
1095+
: raw_fd_stream(SocketFD, true) {}
1096+
1097+
Expected<std::unique_ptr<raw_socket_stream>>
1098+
raw_socket_stream::createConnectedUnix(StringRef SocketPath) {
1099+
#ifdef _WIN32
1100+
WSABalancer _;
1101+
#endif // _WIN32
1102+
Expected<int> FD = GetSocketFD(SocketPath);
1103+
if (!FD)
1104+
return FD.takeError();
1105+
return std::make_unique<raw_socket_stream>(*FD);
1106+
}
1107+
1108+
raw_socket_stream::~raw_socket_stream() {}
1109+
9541110
//===----------------------------------------------------------------------===//
9551111
// raw_string_ostream
9561112
//===----------------------------------------------------------------------===//

llvm/unittests/Support/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ add_llvm_unittest(SupportTests
103103
raw_ostream_test.cpp
104104
raw_pwrite_stream_test.cpp
105105
raw_sha1_ostream_test.cpp
106+
raw_socket_stream_test.cpp
106107
xxhashTest.cpp
107108

108109
DEPENDS
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#include "llvm/ADT/SmallString.h"
2+
#include "llvm/Config/llvm-config.h"
3+
#include "llvm/Support/Casting.h"
4+
#include "llvm/Support/FileSystem.h"
5+
#include "llvm/Support/FileUtilities.h"
6+
#include "llvm/Support/raw_ostream.h"
7+
#include "llvm/Testing/Support/Error.h"
8+
#include "gtest/gtest.h"
9+
#include <future>
10+
#include <iostream>
11+
#include <stdlib.h>
12+
13+
using namespace llvm;
14+
15+
namespace {
16+
17+
TEST(raw_socket_streamTest, CLIENT_TO_SERVER_AND_SERVER_TO_CLIENT) {
18+
SmallString<100> SocketPath;
19+
llvm::sys::fs::createUniquePath("test_raw_socket_stream.sock", SocketPath,
20+
true);
21+
22+
char Bytes[8];
23+
24+
Expected<ListeningSocket> MaybeServerListener =
25+
ListeningSocket::createUnix(SocketPath);
26+
ASSERT_THAT_EXPECTED(MaybeServerListener, llvm::Succeeded());
27+
28+
ListeningSocket ServerListener = std::move(*MaybeServerListener);
29+
30+
Expected<std::unique_ptr<raw_socket_stream>> MaybeClient =
31+
raw_socket_stream::createConnectedUnix(SocketPath);
32+
ASSERT_THAT_EXPECTED(MaybeClient, llvm::Succeeded());
33+
34+
raw_socket_stream &Client = **MaybeClient;
35+
36+
Expected<std::unique_ptr<raw_socket_stream>> MaybeServer =
37+
ServerListener.accept();
38+
ASSERT_THAT_EXPECTED(MaybeServer, llvm::Succeeded());
39+
40+
raw_socket_stream &Server = **MaybeServer;
41+
42+
Client << "01234567";
43+
Client.flush();
44+
45+
ssize_t BytesRead = Server.read(Bytes, 8);
46+
47+
std::string string(Bytes, 8);
48+
49+
ASSERT_EQ(8, BytesRead);
50+
ASSERT_EQ("01234567", string);
51+
}
52+
} // namespace

0 commit comments

Comments
 (0)