mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-19 23:03:45 +01:00
Merge pull request #5964
9a1dceaUse CScheduler for net's DumpAddresses (Gavin Andresen)ddd0acdCreate a scheduler thread for lightweight tasks (Gavin Andresen)68d370bCScheduler unit test (Gavin Andresen)cfefe5bscheduler: fix with boost <= 1.50 (Cory Fields)ca66717build: make libboost_chrono mandatory (Cory Fields)928b950CScheduler class for lightweight task scheduling (Gavin Andresen)e656560[Qt] add defaultConfirmTarget constant to sendcoinsdialog (Philip Kaufmann)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
#include "net.h"
|
||||
#include "rpcserver.h"
|
||||
#include "script/standard.h"
|
||||
#include "scheduler.h"
|
||||
#include "txdb.h"
|
||||
#include "ui_interface.h"
|
||||
#include "util.h"
|
||||
@@ -564,7 +565,7 @@ bool InitSanityCheck(void)
|
||||
/** Initialize bitcoin.
|
||||
* @pre Parameters should be parsed and config file should be read.
|
||||
*/
|
||||
bool AppInit2(boost::thread_group& threadGroup)
|
||||
bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||
{
|
||||
// ********************************************************* Step 1: setup
|
||||
#ifdef _MSC_VER
|
||||
@@ -890,6 +891,10 @@ bool AppInit2(boost::thread_group& threadGroup)
|
||||
threadGroup.create_thread(&ThreadScriptCheck);
|
||||
}
|
||||
|
||||
// Start the lightweight task scheduler thread
|
||||
CScheduler::Function serviceLoop = boost::bind(&CScheduler::serviceQueue, &scheduler);
|
||||
threadGroup.create_thread(boost::bind(&TraceThread<CScheduler::Function>, "scheduler", serviceLoop));
|
||||
|
||||
/* Start the RPC server already. It will be started in "warmup" mode
|
||||
* and not really process calls already (but it will signify connections
|
||||
* that the server is there and will be ready later). Warmup mode will
|
||||
@@ -1373,7 +1378,7 @@ bool AppInit2(boost::thread_group& threadGroup)
|
||||
LogPrintf("mapAddressBook.size() = %u\n", pwalletMain ? pwalletMain->mapAddressBook.size() : 0);
|
||||
#endif
|
||||
|
||||
StartNode(threadGroup);
|
||||
StartNode(threadGroup, scheduler);
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
// Generate coins in the background
|
||||
|
||||
Reference in New Issue
Block a user