diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2015-05-14 14:23:13 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2015-05-14 14:27:07 -0400 |
commit | b4c219b622235e66fecd5dee1883908d5336a6c0 (patch) | |
tree | aee090d0cd5cfd0023ec23c9295b587920527585 /src/net.h | |
parent | 339321522c5c8779ef1d4b1769b23ec7a69b18d9 (diff) | |
parent | 9a1dcea2df2a6a89acf79bc41972e937d783a080 (diff) | |
download | bitcoin-b4c219b622235e66fecd5dee1883908d5336a6c0.tar.xz |
Merge pull request #5964
9a1dcea Use CScheduler for net's DumpAddresses (Gavin Andresen)
ddd0acd Create a scheduler thread for lightweight tasks (Gavin Andresen)
68d370b CScheduler unit test (Gavin Andresen)
cfefe5b scheduler: fix with boost <= 1.50 (Cory Fields)
ca66717 build: make libboost_chrono mandatory (Cory Fields)
928b950 CScheduler class for lightweight task scheduling (Gavin Andresen)
e656560 [Qt] add defaultConfirmTarget constant to sendcoinsdialog (Philip Kaufmann)
Diffstat (limited to 'src/net.h')
-rw-r--r-- | src/net.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -32,6 +32,7 @@ class CAddrMan; class CBlockIndex; +class CScheduler; class CNode; namespace boost { @@ -72,7 +73,7 @@ bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOu void MapPort(bool fUseUPnP); unsigned short GetListenPort(); bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false); -void StartNode(boost::thread_group& threadGroup); +void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler); bool StopNode(); void SocketSendData(CNode *pnode); |