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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +5 -2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8eff001655 - Show all commits

7
src/thread/parallel.cpp
View file

@ -64,6 +64,7 @@ namespace fc {
{ {
public: public:
pool_impl( const uint16_t num_threads ) pool_impl( const uint16_t num_threads )
: idle_threads( 2 * num_threads ), waiting_tasks( 200 )
{ {
notifiers.resize( num_threads ); notifiers.resize( num_threads );
threads.reserve( num_threads ); threads.reserve( num_threads );
@ -99,7 +100,8 @@ namespace fc {
threads[ini->id]->async_task( task, priority() ); threads[ini->id]->async_task( task, priority() );
return; return;
} }
waiting_tasks.push( task ); while( !waiting_tasks.push( task ) )
elog( "Worker pool internal error" );
} }
task_base* enqueue_idle_thread( idle_notifier_impl* ini ) task_base* enqueue_idle_thread( idle_notifier_impl* ini )
@ -110,7 +112,8 @@ namespace fc {
fc::unique_lock<fc::spin_yield_lock> lock(pool_lock); fc::unique_lock<fc::spin_yield_lock> lock(pool_lock);
if( waiting_tasks.pop( task ) ) if( waiting_tasks.pop( task ) )
return task; return task;
idle_threads.push( ini ); while( !idle_threads.push( ini ) )
elog( "Worker pool internal error" );
return 0; return 0;
} }
private: private: