Skip to content

TaskQueue(Test): Add destructor to close FDs, preventing resource leak, fix race in TaskSignalHandling test #85083

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 2 commits into from
Oct 24, 2025
Merged

TaskQueue(Test): Add destructor to close FDs, preventing resource leak, fix race in TaskSignalHandling test #85083

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
3dcfdaf
TaskQueueTest: Fix race condition in TaskSignalHandling test
KushalP Oct 23, 2025
8f14263
TaskQueue: Add destructor to close FDs, preventing resource leak
KushalP Oct 23, 2025
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
12 changes: 12 additions & 0 deletions lib/Basic/Unix/TaskQueue.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ public:
"Env must either be empty or null-terminated!");
}

~Task() {
// Ensure pipes are closed when the task is destroyed
if (Pipe >= 0) {
close(Pipe);
Pipe = -1;
}
if (ErrorPipe >= 0) {
close(ErrorPipe);
ErrorPipe = -1;
}
}

const char *getExecPath() const { return ExecPath; }
ArrayRef<const char *> getArgs() const { return Args; }
StringRef getOutput() const { return Output; }
Expand Down
15 changes: 13 additions & 2 deletions unittests/Basic/TaskQueueTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <algorithm>
#include <chrono>
#include <condition_variable>
#include <mutex>
#include <thread>

Expand Down Expand Up @@ -93,9 +94,15 @@ TEST(TaskQueueTest, TaskSignalHandling) {
bool TaskSignalled = false;
int ReceivedSignal = 0;
ProcessId ChildPid = 0;
std::mutex PidMutex;
std::condition_variable PidCv;

auto TaskBegan = [&](ProcessId Pid, void *Context) {
ChildPid = Pid;
{
std::lock_guard<std::mutex> lock(PidMutex);
ChildPid = Pid;
}
PidCv.notify_one();
};

auto TaskSignalledCallback = [&](ProcessId Pid, llvm::StringRef ErrorMsg,
Expand All @@ -117,7 +124,11 @@ TEST(TaskQueueTest, TaskSignalHandling) {
TQ.execute(TaskBegan, nullptr, TaskSignalledCallback);
});

std::this_thread::sleep_for(std::chrono::milliseconds(100));
// Wait for the task to actually start and get its PID
{
std::unique_lock<std::mutex> lock(PidMutex);
PidCv.wait_for(lock, std::chrono::seconds(5), [&] { return ChildPid > 0; });
}

if (ChildPid > 0) {
EXPECT_EQ(0, kill(ChildPid, SIGTERM)) << "Should kill the specific child process we spawned";
Expand Down