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

Merge pull request #130 from openledger/thread_d_memory_leak

Browse source 
Fix memory leak. Not all tasks are deleted in thread_d dtor.
This commit is contained in:
Abit 2019-05-21 21:34:45 +02:00 committed by GitHub
commit 397830b8ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/thread/thread.cpp
View file

@ -114,8 +114,10 @@ namespace fc {
} }
thread::~thread() { thread::~thread() {
if( my ) if( my && is_running() )
{
quit(); quit();
}
delete my; delete my;
} }
@ -342,6 +344,10 @@ namespace fc {
void thread::async_task( task_base* t, const priority& p, const time_point& tp ) { void thread::async_task( task_base* t, const priority& p, const time_point& tp ) {
assert(my); assert(my);
if ( !is_running() )
{
FC_THROW_EXCEPTION( canceled_exception, "Thread is not running.");
}
t->_when = tp; t->_when = tp;
task_base* stale_head = my->task_in_queue.load(boost::memory_order_relaxed); task_base* stale_head = my->task_in_queue.load(boost::memory_order_relaxed);
do { t->_next = stale_head; do { t->_next = stale_head;

15
src/thread/thread_d.hpp
View file

@ -55,7 +55,14 @@ namespace fc {
current = nullptr; current = nullptr;
fc::context* temp; fc::context* temp;
for (fc::context* ready_context : ready_heap) 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(); ready_heap.clear();
while (blocked) while (blocked)
{ {
@ -524,10 +531,10 @@ namespace fc {
next->_set_active_context( current ); next->_set_active_context( current );
current->cur_task = next; current->cur_task = next;
next->run(); fc::shared_ptr<task_base> next_ptr(next);
next_ptr->run();
current->cur_task = 0; current->cur_task = 0;
next->_set_active_context(0); next_ptr->_set_active_context(0);
next->release();
current->reinitialize(); current->reinitialize();
} }