diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-01-15T20·23+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-01-15T20·23+0000 |
| commit | 447089a5f699f085661287dec4b3d88219f67068 (patch) | |
| tree | e460c615181db3e6b6f8b48e4e934b372ecac043 /src/libstore/exec.cc | |
| parent | 08719c6c97e25fb362eeb7463d8b764ecefc53cb (diff) | |
* Catch SIGINT to terminate cleanly when the user tries to interrupt
Nix. This is to prevent Berkeley DB from becoming wedged. Unfortunately it is not possible to throw C++ exceptions from a signal handler. In fact, you can't do much of anything except change variables of type `volatile sig_atomic_t'. So we set an interrupt flag in the signal handler and check it at various strategic locations in the code (by calling checkInterrupt()). Since this is unlikely to cover all cases (e.g., (semi-)infinite loops), sometimes SIGTERM may now be required to kill Nix.
Diffstat (limited to 'src/libstore/exec.cc')
| -rw-r--r-- | src/libstore/exec.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libstore/exec.cc b/src/libstore/exec.cc index b25423b4449a..01577143dc9e 100644 --- a/src/libstore/exec.cc +++ b/src/libstore/exec.cc @@ -108,7 +108,9 @@ void runProgram(const string & program, int status; if (waitpid(pid, &status, 0) != pid) throw Error("unable to wait for child"); - + + checkInterrupt(); + if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { if (keepFailed) { printMsg(lvlTalkative, |