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

do not interrupt() fibers at scheduler destruction

Browse Source 
- the user is responsible that all worker fibers terminate
- dispatcher fiber must run till all worker fiber are terminated and
  the the scheduler is shut down
- flag shutdown is set in ~scheduler before resuming the ready fibers
- the ready fibers must contain at least the dispatcher fiber
This commit is contained in:
oliver Kowalke
2016-04-14 09:14:50 +02:00
parent 0a911f4ab5
commit f7d151ac86
1 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/scheduler.cpp
View File

@@ -110,16 +110,20 @@ scheduler::~scheduler() {
// signal dispatcher-context termination
shutdown_ = true;
// resume pending fibers
get_next_()->resume();
context * ctx = get_next_();
if ( nullptr != ctx) {
ctx->resume();
}
// no context' in worker-queue
//BOOST_ASSERT( worker_queue_.empty() );
std::unique_lock< detail::spinlock > lk( worker_splk_);
BOOST_ASSERT( worker_queue_.empty() );
BOOST_ASSERT( terminated_queue_.empty() );
BOOST_ASSERT( ! sched_algo_->has_ready_fibers() );
BOOST_ASSERT( remote_ready_queue_.empty() );
BOOST_ASSERT( sleep_queue_.empty() );
// set active context to nullptr
context::reset_active();
// deallocate dispatcher-context
BOOST_ASSERT( ! dispatcher_ctx_->ready_is_linked() );
dispatcher_ctx_.reset();
// set main-context to nullptr
main_ctx_ = nullptr;
@@ -133,8 +137,14 @@ boost::context::execution_context< detail::data_t * >
scheduler::dispatch() noexcept {
#endif
BOOST_ASSERT( context::active() == dispatcher_ctx_);
while ( ! shutdown_) {
// release termianted context'
for (;;) {
std::unique_lock< detail::spinlock > lk( worker_splk_);
bool no_worker = worker_queue_.empty();
lk.unlock();
if ( shutdown_ && no_worker) {
break;
}
// release terminated context'
release_terminated_();
// get context' from remote ready-queue
remote_ready2ready_();
@@ -162,32 +172,6 @@ scheduler::dispatch() noexcept {
sched_algo_->suspend_until( suspend_time);
}
}
// loop till all context' have been terminated
std::unique_lock< detail::spinlock > lk( worker_splk_);
while ( ! worker_queue_.empty() ) {
// interrupt all context' in worker-queue
worker_queue_t::iterator e = worker_queue_.end();
for ( worker_queue_t::iterator i = worker_queue_.begin(); i != e;) {
context * ctx = & ( * i);
BOOST_ASSERT( ! ctx->is_context( type::main_context) );
BOOST_ASSERT( ! ctx->is_context( type::dispatcher_context) );
if ( ctx->is_terminated() ) {
i = worker_queue_.erase( i);
} else {
ctx->request_interruption( true);
set_ready( ctx);
++i;
}
}
context * ctx = nullptr;
if ( nullptr != ( ctx = get_next_() ) ) {
// resume ready context's
sched_algo_->awakened( dispatcher_ctx_.get() );
ctx->resume();
BOOST_ASSERT( context::active() == dispatcher_ctx_.get() );
}
}
lk.unlock();
// release termianted context'
release_terminated_();
// return to main-context