diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-01 11:33:11 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-04-01 11:33:11 +0200 |
commit | c4adc6d6aa772cb9b8e5dc294bbdc75b4e22f38d (patch) | |
tree | 9afe3b10ec514dc5b1b284b4b39bd61f22d4f7f9 /build2/algorithm.cxx | |
parent | 01570ff5ee4568c63d8466cfb972cc31a2451a18 (diff) |
Redo handling of unhandled exceptions in async execution
Here is the problem: noexcept looses the call stack. That is, unlike an
unhandled exception, if noexcept is tripped, then you won't see the place
where it was thrown.
In this new implementation we now have noexcept only on the task thunk. And
the task is called via a thunk only in case of async execution. This means
that if we are executing serially (-j 1), then this will be an unhandled
exception, not noexcept. Hopefully will be a bit easier to debug.
Diffstat (limited to 'build2/algorithm.cxx')
-rw-r--r-- | build2/algorithm.cxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index c9396ef..ccbbae6 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -437,7 +437,7 @@ namespace build2 // If step is true then perform only one step of the match/apply sequence. // static target_state - match_impl (action a, target_lock& l, bool step = false) noexcept + match_impl (action a, target_lock& l, bool step = false) { assert (l.target != nullptr); target& t (*l.target); @@ -485,13 +485,6 @@ namespace build2 t.state_ = target_state::failed; l.offset = target::offset_applied; } - catch (const std::exception& e) - { - diag_lock l; - *diag_stream << "unhandled exception: " << e << endl; - assert (false); - abort (); - } return t.state_; } @@ -546,7 +539,7 @@ namespace build2 *task_count, [a] (target& t, size_t offset, - const diag_frame* ds) noexcept + const diag_frame* ds) { diag_frame df (ds); phase_lock pl (run_phase::match); @@ -747,7 +740,7 @@ namespace build2 } static target_state - execute_impl (action a, target& t) noexcept + execute_impl (action a, target& t) { assert (t.task_count.load (memory_order_consume) == target::count_busy () && t.state_ == target_state::unknown); @@ -788,13 +781,6 @@ namespace build2 { ts = t.state_ = target_state::failed; } - catch (const std::exception& e) - { - diag_lock l; - *diag_stream << "unhandled exception: " << e << endl; - assert (false); - abort (); - } // Decrement the task count (to count_executed) and wake up any threads // that might be waiting for this target. @@ -880,7 +866,7 @@ namespace build2 // if (sched.async (start_count, *task_count, - [a] (target& t, const diag_frame* ds) noexcept + [a] (target& t, const diag_frame* ds) { diag_frame df (ds); execute_impl (a, t); |