boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-09 11:02:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of http://github.com/olk/boost-fiber into develop

Browse Source
This commit is contained in:
Nat Goodspeed
2015-09-09 21:47:46 -04:00
parent 2b6135364e 513204a75e
commit c9bd8360b4
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/interrupt.cpp
View File

@@ -31,10 +31,6 @@ int main()
try
{
f.join();
std::cout << "done." << std::endl;
return EXIT_SUCCESS;
}
catch ( boost::fibers::fiber_interrupted const&)
{ std::cerr << "interrupted" << std::endl; }
@@ -43,5 +39,7 @@ int main()
catch (...)
{ std::cerr << "unhandled exception" << std::endl; }
return EXIT_FAILURE;
std::cout << "done." << std::endl;
return EXIT_SUCCESS;
}

32
src/scheduler.cpp
View File

@@ -90,17 +90,21 @@ scheduler::~scheduler() noexcept {
break;
}
}
// FIXME
#if 0
// destroy terminated fibers from terminated-queue
tqueue_t::iterator e = tqueue_.end();
for ( tqueue_t::iterator i = tqueue_.begin(); i != e;) {
//BOOST_ASSERT( i->is_terminated() );
// intrusive_ptr_release( & ( * i) ); // might call ~context()
//i = tqueue_.erase( i);
context * f( & ( * i) );
BOOST_ASSERT( f->is_terminated() );
i = tqueue_.erase( i);
BOOST_ASSERT( ! f->state_is_linked() );
BOOST_ASSERT( ! f->wait_is_linked() );
BOOST_ASSERT( ! f->yield_is_linked() );
intrusive_ptr_release( f); // might call ~context()
}
#endif
BOOST_ASSERT( wqueue_.empty() );
BOOST_ASSERT( context::active() == main_context_);
BOOST_ASSERT( wqueue_.empty() );
BOOST_ASSERT( yqueue_.empty() );
BOOST_ASSERT( 0 == sched_algo_->ready_fibers() );
}
void
@@ -186,15 +190,17 @@ scheduler::run( context * af) {
BOOST_ASSERT_MSG( f->is_ready(), "fiber with invalid state in ready-queue");
// resume fiber f
resume_( af, f);
// FIXME
#if 0
// destroy terminated fibers from terminated-queue
tqueue_t::iterator e = tqueue_.end();
for ( tqueue_t::iterator i = tqueue_.begin(); i != e;) {
//BOOST_ASSERT( i->is_terminated() );
// intrusive_ptr_release( & ( * i) ); // might call ~context()
//i = tqueue_.erase( i);
context * f( & ( * i) );
BOOST_ASSERT( f->is_terminated() );
i = tqueue_.erase( i);
BOOST_ASSERT( ! f->state_is_linked() );
BOOST_ASSERT( ! f->wait_is_linked() );
BOOST_ASSERT( ! f->yield_is_linked() );
intrusive_ptr_release( f); // might call ~context()
}
#endif
return;
} else {
// no fibers ready to run; the thread should sleep