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/bitcoinrpc.cpp | |
| parent | ec2ed582323fe05e978073c5f95df8291f06ae62 (diff) | |
| parent | c59881eaee61ae7d3b16001a75b9fd9fd09af297 (diff) | |
| download | bitcoin-25bc37f8a23487386d96ed27d17f352497de64f2.tar.xz | |
Merge branch 'threadid' of https://github.com/sipa/bitcoin
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index cf5bc64bb9..30a6344b8f 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -2355,15 +2355,15 @@ void ThreadRPCServer(void* parg) IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer(parg)); try { - vnThreadsRunning[4]++; + vnThreadsRunning[THREAD_RPCSERVER]++; ThreadRPCServer2(parg); - vnThreadsRunning[4]--; + vnThreadsRunning[THREAD_RPCSERVER]--; } catch (std::exception& e) { - vnThreadsRunning[4]--; + vnThreadsRunning[THREAD_RPCSERVER]--; PrintException(&e, "ThreadRPCServer()"); } catch (...) { - vnThreadsRunning[4]--; + vnThreadsRunning[THREAD_RPCSERVER]--; PrintException(NULL, "ThreadRPCServer()"); } printf("ThreadRPCServer exiting\n"); @@ -2443,7 +2443,7 @@ void ThreadRPCServer2(void* parg) #endif ip::tcp::endpoint peer; - vnThreadsRunning[4]--; + vnThreadsRunning[THREAD_RPCSERVER]--; #ifdef USE_SSL acceptor.accept(sslStream.lowest_layer(), peer); #else |