Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

if a task is canceled before it is run, then it will throw a canceled exception

Browse source
This commit is contained in:
Daniel Larimer 2014-06-28 21:08:15 -04:00
parent 1e80a7071f
commit ffa617183e
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thread/task.cpp
View file

@ -35,7 +35,10 @@ namespace fc {
} }
void task_base::run_impl() { void task_base::run_impl() {
try { try {
if( !canceled() )
_run_functor( _functor, _promise_impl ); _run_functor( _functor, _promise_impl );
else
FC_THROW_EXCEPTION( canceled_exception, "${description}", ("description", get_desc() ) );
} }
catch ( const exception& e ) catch ( const exception& e )
{ {

1
src/thread/thread_d.hpp
View file

@ -341,6 +341,7 @@ namespace fc {
bool run_next_task() { bool run_next_task() {
check_for_timeouts(); check_for_timeouts();
task_base* next = dequeue(); task_base* next = dequeue();
if( next ) { if( next ) {
next->_set_active_context( current ); next->_set_active_context( current );
current->cur_task = next; current->cur_task = next;