boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-14 12:42:28 +00:00
Code Issues Projects Releases Wiki Activity

std::terminate() called if exception not catched

Browse Source
This commit is contained in:
Oliver Kowalke
2013-10-01 19:44:06 +02:00
parent 147d41833a
commit decba3f33f
10 changed files with 117 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/round_robin.cpp
View File

@@ -19,7 +19,6 @@
#include "boost/fiber/detail/scheduler.hpp"
#include "boost/fiber/exceptions.hpp"
#include "boost/fiber/interruption.hpp"
#ifdef BOOST_HAS_ABI_HEADERS
# include BOOST_ABI_PREFIX
@@ -53,24 +52,15 @@ round_robin::spawn( detail::fiber_base::ptr_t const& f)
// store active fiber in local var
detail::fiber_base::ptr_t tmp = active_fiber_;
try
{
// assign new fiber to active fiber
active_fiber_ = f;
// set active fiber to state_running
active_fiber_->set_running();
// resume active fiber
active_fiber_->resume();
// fiber is resumed
// assign new fiber to active fiber
active_fiber_ = f;
// set active fiber to state_running
active_fiber_->set_running();
// resume active fiber
active_fiber_->resume();
// fiber is resumed
BOOST_ASSERT( f == active_fiber_);
}
catch (...)
{
// reset active fiber to previous
active_fiber_ = tmp;
throw;
}
BOOST_ASSERT( f == active_fiber_);
// reset active fiber to previous
active_fiber_ = tmp;
}
@@ -196,9 +186,6 @@ round_robin::join( detail::fiber_base::ptr_t const& f)
BOOST_ASSERT( tmp == active_fiber_);
BOOST_ASSERT( active_fiber_->is_running() );
// check if fiber was interrupted
this_fiber::interruption_point();
}
else
{
@@ -206,10 +193,6 @@ round_robin::join( detail::fiber_base::ptr_t const& f)
run();
}
// check if joined fiber has an exception
// and rethrow exception
if ( f->has_exception() ) f->rethrow();
BOOST_ASSERT( f->is_terminated() );
}