Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Reorder lock/transaction to start tx only after successful lock (#773)

Browse source
This commit is contained in:
cryptocode 2018-04-02 19:28:29 +02:00 • committed by Lee Bousfield
commit 440f0ec90c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rai/node/node.cpp
View file

@ -1698,8 +1698,8 @@ void rai::gap_cache::add (MDB_txn * transaction_a, std::shared_ptr<rai::block> b
void rai::gap_cache::vote (std::shared_ptr<rai::vote> vote_a)
{
rai::transaction transaction (node.store.environment, nullptr, false);
std::lock_guard<std::mutex> lock (mutex);
rai::transaction transaction (node.store.environment, nullptr, false);
auto hash (vote_a->block->hash ());
auto existing (blocks.get<1> ().find (hash));
if (existing != blocks.get<1> ().end ())
@ -3041,8 +3041,8 @@ bool rai::election::vote (std::shared_ptr<rai::vote> vote_a)
void rai::active_transactions::announce_votes ()
{
std::vector<rai::block_hash> inactive;
rai::transaction transaction (node.store.environment, nullptr, true);
std::lock_guard<std::mutex> lock (mutex);
rai::transaction transaction (node.store.environment, nullptr, true);
{
size_t announcements (0);

2
rai/node/wallet.cpp
View file

@ -716,8 +716,8 @@ node (node_a)
void rai::wallet::enter_initial_password ()
{
rai::transaction transaction (store.environment, nullptr, true);
std::lock_guard<std::recursive_mutex> lock (store.mutex);
rai::transaction transaction (store.environment, nullptr, true);
rai::raw_key password_l;
store.password.value (password_l);
if (password_l.data.is_zero ())