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

Merge latest fc changes into develop branch #11

Merged
pbsa-gitlab merged 19 commits from latest-fc into develop 2019-12-16 18:09:04 +00:00
Conversation 0 Commits 19 Files changed 89 +16 -5
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d16ee316c9 - Show all commits

6
src/thread/thread.cpp
View file

@ -110,7 +110,7 @@ namespace fc {
thread::~thread() {
//wlog( "my ${n}", ("n",name()) );
if( my )
if( my && is_running() )
{
// wlog( "calling quit() on ${n}",("n",my->name) );
quit(); // deletes `my`
@ -333,6 +333,10 @@ namespace fc {
void thread::async_task( task_base* t, const priority& p, const time_point& tp ) {
assert(my);
if( !is_running() )
{
FC_THROW_EXCEPTION( canceled_exception, "Thread is not running.");
}
t->_when = tp;
// slog( "when %lld", t->_when.time_since_epoch().count() );
// slog( "delay %lld", (tp - fc::time_point::now()).count() );

15
src/thread/thread_d.hpp
View file

@ -42,7 +42,14 @@ namespace fc {
delete current;
fc::context* temp;
for (fc::context* ready_context : ready_heap)
delete ready_context;
{
if (ready_context->cur_task)
{
ready_context->cur_task->release();
ready_context->cur_task = nullptr;
}
delete ready_context;
}
ready_heap.clear();
while (blocked)
{
@ -509,10 +516,10 @@ namespace fc {
next->_set_active_context( current );
current->cur_task = next;
next->run();
fc::shared_ptr<task_base> next_ptr(next);
next_ptr->run();
current->cur_task = 0;
next->_set_active_context(0);
next->release();
next_ptr->_set_active_context(0);
current->reinitialize();
}