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:
@@ -26,6 +26,7 @@
|
||||
#include "init.h"
|
||||
#include "main.h"
|
||||
#include "rpcserver.h"
|
||||
#include "scheduler.h"
|
||||
#include "ui_interface.h"
|
||||
#include "util.h"
|
||||
|
||||
@@ -178,6 +179,7 @@ signals:
|
||||
|
||||
private:
|
||||
boost::thread_group threadGroup;
|
||||
CScheduler scheduler;
|
||||
|
||||
/// Pass fatal exception message to UI thread
|
||||
void handleRunawayException(const std::exception *e);
|
||||
@@ -258,7 +260,7 @@ void BitcoinCore::initialize()
|
||||
try
|
||||
{
|
||||
qDebug() << __func__ << ": Running AppInit2 in thread";
|
||||
int rv = AppInit2(threadGroup);
|
||||
int rv = AppInit2(threadGroup, scheduler);
|
||||
if(rv)
|
||||
{
|
||||
/* Start a dummy RPC thread if no RPC thread is active yet
|
||||
|
||||
Reference in New Issue
Block a user