wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 04:21:16 +02:00
Code Activity

Improve SIGINT handling in multi-threaded programs

Browse source 
The flag remembering whether an Interrupted exception was thrown is
now thread-local. Thus, all threads will (eventually) throw
Interrupted. Previously, one thread would throw Interrupted, and then
the other threads wouldn't see that they were supposed to quit.
This commit is contained in:
Eelco Dolstra 2016-03-29 15:08:24 +02:00
parent 4f34c40398
commit ab3ce1cc13
4 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libutil/thread-pool.cc
View file

@ -55,9 +55,10 @@ void ThreadPool::process()
work();
} catch (std::exception & e) {
auto state_(state.lock());
if (state_->exception)
printMsg(lvlError, format("error: %s") % e.what());
else {
if (state_->exception) {
if (!dynamic_cast<Interrupted*>(&e))
printMsg(lvlError, format("error: %s") % e.what());
} else {
state_->exception = std::current_exception();
wakeup.notify_all();
}

6
src/libutil/util.cc
View file

@ -1062,13 +1062,15 @@ void restoreSIGPIPE()
volatile sig_atomic_t _isInterrupted = 0;
thread_local bool interruptThrown = false;
void _interrupted()
{
/* Block user interrupts while an exception is being handled.
Throwing an exception while another exception is being handled
kills the program! */
if (!std::uncaught_exception()) {
_isInterrupted = 0;
if (!interruptThrown && !std::uncaught_exception()) {
interruptThrown = true;
throw Interrupted("interrupted by the user");
}
}

2
src/libutil/util.hh
View file

@ -316,6 +316,8 @@ void restoreSIGPIPE();
extern volatile sig_atomic_t _isInterrupted;
extern thread_local bool interruptThrown;
void _interrupted();
void inline checkInterrupt()