nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential race with parallel processing of txes/signatures/blocks

Browse Source
This commit is contained in:
moneromooo-monero 2016-04-02 14:20:51 +01:00
parent e7c8a32a28
commit 087373eccf
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cryptonote_core/blockchain.cpp
View File

@ -2159,6 +2159,7 @@ bool Blockchain::check_tx_inputs(const transaction& tx, tx_verification_context
if(ioservice_active) \ if(ioservice_active) \
{ \ { \
work.reset(); \ work.reset(); \
while (!ioservice.stopped()) ioservice.poll(); \
threadpool.join_all(); \ threadpool.join_all(); \
ioservice.stop(); \ ioservice.stop(); \
ioservice_active = false; \ ioservice_active = false; \

1
src/wallet/wallet2.cpp
View File

@ -73,6 +73,7 @@ using namespace cryptonote;
#define KILL_IOSERVICE() \ #define KILL_IOSERVICE() \
do { \ do { \
work.reset(); \ work.reset(); \
while (!ioservice.stopped()) ioservice.poll(); \
threadpool.join_all(); \ threadpool.join_all(); \
ioservice.stop(); \ ioservice.stop(); \
} while(0) } while(0)