Skip to content
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

Jump to bottom

[Backport 2.19-maintenance] withFramedSink(): Receive interrupts on the stderr thread #9691

Merged
merged 2 commits into from
Jan 8, 2024
Merged

[Backport 2.19-maintenance] withFramedSink(): Receive interrupts on the stderr thread #9691

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
4b38ebb
withFramedSink(): Receive interrupts on the stderr thread
edolstra Jan 3, 2024
6af94c4
Make some more threads receive interrupts
edolstra Jan 3, 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
3 changes: 3 additions & 0 deletions src/libstore/build/substitution-goal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "substitution-goal.hh"
#include "nar-info.hh"
#include "finally.hh"
#include "signals.hh"

namespace nix {

Expand Down Expand Up @@ -217,6 +218,8 @@ void PathSubstitutionGoal::tryToRun()

thr = std::thread([this]() {
try {
ReceiveInterrupts receiveInterrupts;

/* Wake up the worker loop when we're done. */
Finally updateStats([this]() { outPipe.writeSide.close(); });

Expand Down
3 changes: 3 additions & 0 deletions src/libstore/remote-store.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "logging.hh"
#include "callback.hh"
#include "filetransfer.hh"
#include "signals.hh"

#include <nlohmann/json.hpp>

namespace nix {
Expand Down Expand Up @@ -1071,6 +1073,7 @@ void RemoteStore::ConnectionHandle::withFramedSink(std::function<void(Sink & sin
std::thread stderrThread([&]()
{
try {
ReceiveInterrupts receiveInterrupts;
processStderr(nullptr, nullptr, false);
} catch (...) {
ex = std::current_exception();
Expand Down
2 changes: 2 additions & 0 deletions src/libutil/thread-pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ void ThreadPool::process()

void ThreadPool::doWork(bool mainThread)
{
ReceiveInterrupts receiveInterrupts;

if (!mainThread)
interruptCheck = [&]() { return (bool) quit; };

Expand Down
Loading