diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-10-01 15:30:30 -0700 |
|---|---|---|
| committer | Rebecca Turner <rbt@sent.as> | 2024-10-01 15:49:56 -0700 |
| commit | ee0c195eba7d16b796fd9883e3fe88c0d64ff0bf (patch) | |
| tree | 1048d5203ed5780274bbbd3992f986a5df6a1981 /src/libutil/thread-pool.cc | |
| parent | 775292766025380d04004e42fefbdb8ca40b3fa3 (diff) | |
Split ignoreException to avoid suppressing CTRL-C
This splits `ignoreException` into `ignoreExceptionExceptInterrupt`
(which ignores all exceptions except `Interrupt`, which indicates a
SIGINT/CTRL-C) and `ignoreExceptionInDestructor` (which ignores all
exceptions, so that destructors do not throw exceptions).
This prevents many cases where Nix ignores CTRL-C entirely.
See: https://github.com/NixOS/nix/issues/7245
Upstream-PR: https://github.com/NixOS/nix/pull/11618
Change-Id: Ie7d2467eedbe840d1b9fa2e88a4e88e4ab26a87b
Diffstat (limited to 'src/libutil/thread-pool.cc')
| -rw-r--r-- | src/libutil/thread-pool.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index 0ff83e997..cd380b608 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -109,9 +109,8 @@ void ThreadPool::doWork(bool mainThread) try { std::rethrow_exception(exc); } catch (std::exception & e) { - if (!dynamic_cast<Interrupted*>(&e) && - !dynamic_cast<ThreadPoolShutDown*>(&e)) - ignoreException(); + if (!dynamic_cast<ThreadPoolShutDown*>(&e)) + ignoreExceptionExceptInterrupt(); } catch (...) { } } |