Skip to content

[llvm][Support] ListeningSocket::accept returns operation_canceled if FD is set to -1 #89479

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

Merged
merged 5 commits into from
May 22, 2024
Merged

[llvm][Support] ListeningSocket::accept returns operation_canceled if FD is set to -1 #89479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1748af4
[llvm][Support] Correct error handling in ListeningSocket::support to…
cpsughrue Apr 20, 2024
241e220
Address PR Feedback. Whitespace change and comment length
cpsughrue May 2, 2024
bb5b9d3
Remove iostream
cpsughrue May 2, 2024
b24feb8
Remove ASSERT_THAT_EXPECTED so that takeError is not called twice on …
cpsughrue May 9, 2024
caa5aa5
Merge branch 'main' into raw_socket_stream
cpsughrue May 10, 2024
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
23 changes: 13 additions & 10 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 @@ -204,31 +204,34 @@ ListeningSocket::accept(std::chrono::milliseconds Timeout) {
auto Start = std::chrono::steady_clock::now();
#ifdef _WIN32
PollStatus = WSAPoll(FDs, 2, RemainingTime);
if (PollStatus == SOCKET_ERROR) {
#else
PollStatus = ::poll(FDs, 2, RemainingTime);
#endif
// If FD equals -1 then ListeningSocket::shutdown has been called and it is
// appropriate to return operation_canceled
if (FD.load() == -1)
return llvm::make_error<StringError>(
std::make_error_code(std::errc::operation_canceled),
"Accept canceled");

#if _WIN32
if (PollStatus == SOCKET_ERROR) {
#else
if (PollStatus == -1) {
#endif
// Ignore error if caused by interupting signal
std::error_code PollErrCode = getLastSocketErrorCode();
// Ignore EINTR (signal occured before any request event) and retry
if (PollErrCode != std::errc::interrupted)
return llvm::make_error<StringError>(PollErrCode, "FD poll failed");
}

if (PollStatus == 0)
return llvm::make_error<StringError>(
std::make_error_code(std::errc::timed_out),
"No client requests within timeout window");

if (FDs[0].revents & POLLNVAL)
return llvm::make_error<StringError>(
std::make_error_code(std::errc::bad_file_descriptor),
"File descriptor closed by another thread");

if (FDs[1].revents & POLLIN)
return llvm::make_error<StringError>(
std::make_error_code(std::errc::operation_canceled),
"Accept canceled");
std::make_error_code(std::errc::bad_file_descriptor));

auto Stop = std::chrono::steady_clock::now();
ElapsedTime +=
Expand Down
19 changes: 4 additions & 15 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 @@ -7,7 +7,6 @@
#include "llvm/Testing/Support/Error.h"
#include "gtest/gtest.h"
#include <future>
#include <iostream>
#include <stdlib.h>
#include <thread>

Expand Down Expand Up @@ -86,13 +85,8 @@ TEST(raw_socket_streamTest, TIMEOUT_PROVIDED) {
std::chrono::milliseconds Timeout = std::chrono::milliseconds(100);
Expected<std::unique_ptr<raw_socket_stream>> MaybeServer =
ServerListener.accept(Timeout);

ASSERT_THAT_EXPECTED(MaybeServer, Failed());
llvm::Error Err = MaybeServer.takeError();
llvm::handleAllErrors(std::move(Err), [&](const llvm::StringError &SE) {
std::error_code EC = SE.convertToErrorCode();
ASSERT_EQ(EC, std::errc::timed_out);
});
ASSERT_EQ(llvm::errorToErrorCode(MaybeServer.takeError()),
std::errc::timed_out);
}

TEST(raw_socket_streamTest, FILE_DESCRIPTOR_CLOSED) {
Expand Down Expand Up @@ -122,12 +116,7 @@ TEST(raw_socket_streamTest, FILE_DESCRIPTOR_CLOSED) {

// Wait for the CloseThread to finish
CloseThread.join();

ASSERT_THAT_EXPECTED(MaybeServer, Failed());
llvm::Error Err = MaybeServer.takeError();
llvm::handleAllErrors(std::move(Err), [&](const llvm::StringError &SE) {
std::error_code EC = SE.convertToErrorCode();
ASSERT_EQ(EC, std::errc::operation_canceled);
});
ASSERT_EQ(llvm::errorToErrorCode(MaybeServer.takeError()),
std::errc::operation_canceled);
}
} // namespace
Loading