sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #13028: Make vpwallets usage thread safe

Browse Source 
e2f58f4 wallet: Make vpwallets usage thread safe (João Barbosa)

Pull request description:

  This PR turns the functions introduced in #13017 thread safe. This is required to correctly support dynamically loading wallets, which is implemented in #10740.

Tree-SHA512: efaa09e501636cf957aa33de83719ce09dc0c2a19daff741a94ef10d6b7ba5dee538355b80c96ead995140f99f5df0c92fb0e22ae1adb8f397eb478280c8d8c7
This commit is contained in:
Wladimir J. van der Laan 2018-04-30 17:19:00 +02:00 committed by Pasta
parent b0dc2ab3c1
commit 3d73de3381
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet.cpp
View File

@ -48,10 +48,12 @@
#include <boost/algorithm/string/replace.hpp>
#include <boost/thread.hpp>
static std::vector<CWallet*> vpwallets;
static CCriticalSection cs_wallets;
static std::vector<CWallet*> vpwallets GUARDED_BY(cs_wallets);
bool AddWallet(CWallet* wallet)
{
LOCK(cs_wallets);
assert(wallet);
std::vector<CWallet*>::const_iterator i = std::find(vpwallets.begin(), vpwallets.end(), wallet);
if (i != vpwallets.end()) return false;
@ -61,6 +63,7 @@ bool AddWallet(CWallet* wallet)
bool RemoveWallet(CWallet* wallet)
{
LOCK(cs_wallets);
assert(wallet);
std::vector<CWallet*>::iterator i = std::find(vpwallets.begin(), vpwallets.end(), wallet);
if (i == vpwallets.end()) return false;
@ -70,16 +73,19 @@ bool RemoveWallet(CWallet* wallet)
bool HasWallets()
{
LOCK(cs_wallets);
return !vpwallets.empty();
}
std::vector<CWallet*> GetWallets()
{
LOCK(cs_wallets);
return vpwallets;
}
CWallet* GetWallet(const std::string& name)
{
LOCK(cs_wallets);
for (CWallet* wallet : vpwallets) {
if (wallet->GetName() == name) return wallet;
}