diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-17 13:40:42 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-17 13:40:42 -0500 |
commit | 25bc37f8a23487386d96ed27d17f352497de64f2 (patch) | |
tree | 50fcc0c9764e8e425d613f35ba2c7cb3e9b3c6b2 /src/net.h | |
parent | ec2ed582323fe05e978073c5f95df8291f06ae62 (diff) | |
parent | c59881eaee61ae7d3b16001a75b9fd9fd09af297 (diff) | |
download | bitcoin-25bc37f8a23487386d96ed27d17f352497de64f2.tar.xz |
Merge branch 'threadid' of https://github.com/sipa/bitcoin
Diffstat (limited to 'src/net.h')
-rw-r--r-- | src/net.h | 16 |
1 files changed, 14 insertions, 2 deletions
@@ -68,14 +68,26 @@ public: - +enum threadId +{ + THREAD_SOCKETHANDLER, + THREAD_OPENCONNECTIONS, + THREAD_MESSAGEHANDLER, + THREAD_MINER, + THREAD_RPCSERVER, + THREAD_UPNP, + THREAD_DNSSEED, + THREAD_ADDEDCONNECTIONS, + + THREAD_MAX +}; extern bool fClient; extern bool fAllowDNS; extern uint64 nLocalServices; extern CAddress addrLocalHost; extern uint64 nLocalHostNonce; -extern boost::array<int, 10> vnThreadsRunning; +extern boost::array<int, THREAD_MAX> vnThreadsRunning; extern std::vector<CNode*> vNodes; extern CCriticalSection cs_vNodes; |