Skip to content

[llvm][Support] Use ::closesocket for native sockets on Windows #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tagolog wants to merge 2 commits into from
Closed

[llvm][Support] Use ::closesocket for native sockets on Windows #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bec57a
[llvm][Support] Use ::closesocket for native sockets on Windows
tagolog Sep 25, 2026
d2bb12e
[llvm][Support] Unify NativeSocket creation around INVALID_SOCKET so …
tagolog Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions llvm/lib/Support/raw_socket_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@ static std::error_code getLastSocketErrorCode() {
#endif
}

#ifdef _WIN32
using NativeSocket = SOCKET;
#else
using NativeSocket = int;
#define INVALID_SOCKET -1
#endif

static int closeSocket(NativeSocket Socket) {
#ifdef _WIN32
return ::closesocket(Socket);
#else
return ::close(Socket);
#endif
}

static Expected<sockaddr_un> setSocketAddr(StringRef SocketPath) {
struct sockaddr_un Addr;
memset(&Addr, 0, sizeof(Addr));
Expand All @@ -76,13 +91,8 @@ static Expected<sockaddr_un> setSocketAddr(StringRef SocketPath) {
}

static Expected<int> getSocketFD(StringRef SocketPath) {
#ifdef _WIN32
SOCKET Socket = socket(AF_UNIX, SOCK_STREAM, 0);
NativeSocket Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if (Socket == INVALID_SOCKET) {
#else
int Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if (Socket == -1) {
#endif // _WIN32
return llvm::make_error<StringError>(getLastSocketErrorCode(),
"Create socket failed");
}
Expand All @@ -97,13 +107,16 @@ static Expected<int> getSocketFD(StringRef SocketPath) {
setsockopt(Socket, SOL_SOCKET, SO_PEERCRED, NULL, 0);
#endif
Expected<struct sockaddr_un> Addr = setSocketAddr(SocketPath);
if (!Addr)
if (!Addr) {
closeSocket(Socket);
return Addr.takeError();
}

if (::connect(Socket, (struct sockaddr *)&*Addr, sizeof(*Addr)) == -1) {
::close(Socket);
return llvm::make_error<StringError>(getLastSocketErrorCode(),
"Connect socket failed");
// Grab the error code before closing, which may overwrite it.
std::error_code EC = getLastSocketErrorCode();
closeSocket(Socket);
return llvm::make_error<StringError>(EC, "Connect socket failed");
}

#ifdef _WIN32
Expand Down Expand Up @@ -158,12 +171,9 @@ Expected<ListeningSocket> ListeningSocket::createUnix(StringRef SocketPath,

#ifdef _WIN32
WSABalancer _;
SOCKET Socket = socket(AF_UNIX, SOCK_STREAM, 0);
#endif // _WIN32
NativeSocket Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if (Socket == INVALID_SOCKET)
#else
int Socket = socket(AF_UNIX, SOCK_STREAM, 0);
if (Socket == -1)
#endif
return llvm::make_error<StringError>(getLastSocketErrorCode(),
"socket create failed");

Expand All @@ -177,13 +187,15 @@ Expected<ListeningSocket> ListeningSocket::createUnix(StringRef SocketPath,
setsockopt(Socket, SOL_SOCKET, SO_PEERCRED, NULL, 0);
#endif
Expected<struct sockaddr_un> Addr = setSocketAddr(SocketPath);
if (!Addr)
if (!Addr) {
closeSocket(Socket);
return Addr.takeError();
}

if (::bind(Socket, (struct sockaddr *)&*Addr, sizeof(*Addr)) == -1) {
// Grab error code from call to ::bind before calling ::close
// Grab error code from call to ::bind before closing the socket
std::error_code EC = getLastSocketErrorCode();
::close(Socket);
closeSocket(Socket);
return llvm::make_error<StringError>(EC, "Bind error");
}

Expand Down
10 changes: 10 additions & 0 deletions llvm/unittests/Support/raw_socket_stream_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,16 @@ TEST_F(raw_socket_streamTest, ACCEPT_WITH_TIMEOUT) {
std::errc::timed_out);
}

TEST_F(raw_socket_streamTest, CONNECT_FAILURE_RETURNS_ERROR) {
ServerListener->shutdown();

// Connecting to a closed or nonexistent socket should return an error,
// not terminate the process while cleaning up the temporary native socket.
Expected<std::unique_ptr<raw_socket_stream>> MaybeClient =
raw_socket_stream::createConnectedUnix(SocketPath);
ASSERT_THAT_EXPECTED(MaybeClient, llvm::Failed());
}

TEST_F(raw_socket_streamTest, ACCEPT_WITH_SHUTDOWN) {
// Create a separate thread to close the socket after a delay. Simulates a
// signal handler calling ServerListener::shutdown
Expand Down