diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-08-26 14:37:23 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-08-31 12:55:16 -0400 |
| commit | 6cc4a62c0e696dcb9d90ba0504f688e4f644a10f (patch) | |
| tree | 5b365769be7c8be7caf6c31c4bdb1b4798be9ef4 /src/main.cpp | |
| parent | b0243da77c6ee8d8ca59b4423f333a179bff02cf (diff) | |
Fix rpc-hanging deadlocks
Collapsed multiple wallet mutexes to a single cs_wallet, to avoid deadlocks with wallet methods that acquired locks in different order.
Also change master RPC call handler to acquire cs_main and cs_wallet locks before executing RPC calls; requiring each RPC call to acquire the right set of locks in the right order was too error-prone.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index f483312065..390632aaf5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2879,7 +2879,7 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey) reservekey.KeepKey(); // Track how many getdata requests this block gets - CRITICAL_BLOCK(wallet.cs_mapRequestCount) + CRITICAL_BLOCK(wallet.cs_wallet) wallet.mapRequestCount[pblock->GetHash()] = 0; // Process this block the same as if we had received it from another node |