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

Merge #16716: wallet: Use wallet name instead of pointer on unload/release

Browse Source 
d9d8984270dbb004ec94f8dbb289be2bc9e4dbc3 wallet: Use wallet name instead of pointer on unload/release (João Barbosa)

Pull request description:

  Fixes #16668. Wallet name is unique so it can be used instead of pointer.

ACKs for top commit:
  meshcollider:
    utACK d9d8984270dbb004ec94f8dbb289be2bc9e4dbc3
  instagibbs:
    utACK d9d8984270
  ryanofsky:
    utACK d9d8984270dbb004ec94f8dbb289be2bc9e4dbc3. Alternately I think it might be possible to use an intptr_t set instead of a string set to get around the undefined behavior described in the issue.

Tree-SHA512: eccd4d260cd4c02b52c30deeb32dbfd190a1151a5340eb3aa4ece0dc6ae3b3ed746ce5617336461f6f27c437c435629cd07d20beb1c5450f23b75edde6728598
This commit is contained in:
fanquake 2019-08-31 08:50:17 +08:00 committed by pasta
parent 54bfed144f
commit 44c7bb618e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wallet/wallet.cpp
View File

@ -100,13 +100,14 @@ std::shared_ptr<CWallet> GetWallet(const std::string& name)
static Mutex g_wallet_release_mutex; static Mutex g_wallet_release_mutex;
static std::condition_variable g_wallet_release_cv; static std::condition_variable g_wallet_release_cv;
static std::set<CWallet*> g_unloading_wallet_set; static std::set<std::string> g_unloading_wallet_set;
// Custom deleter for shared_ptr<CWallet>. // Custom deleter for shared_ptr<CWallet>.
static void ReleaseWallet(CWallet* wallet) static void ReleaseWallet(CWallet* wallet)
{ {
// Unregister and delete the wallet right after BlockUntilSyncedToCurrentChain // Unregister and delete the wallet right after BlockUntilSyncedToCurrentChain
// so that it's in sync with the current chainstate. // so that it's in sync with the current chainstate.
const std::string name = wallet->GetName();
wallet->WalletLogPrintf("Releasing wallet\n"); wallet->WalletLogPrintf("Releasing wallet\n");
wallet->BlockUntilSyncedToCurrentChain(); wallet->BlockUntilSyncedToCurrentChain();
wallet->Flush(); wallet->Flush();
@ -115,7 +116,7 @@ static void ReleaseWallet(CWallet* wallet)
// Wallet is now released, notify UnloadWallet, if any. // Wallet is now released, notify UnloadWallet, if any.
{ {
LOCK(g_wallet_release_mutex); LOCK(g_wallet_release_mutex);
if (g_unloading_wallet_set.erase(wallet) == 0) { if (g_unloading_wallet_set.erase(name) == 0) {
// UnloadWallet was not called for this wallet, all done. // UnloadWallet was not called for this wallet, all done.
return; return;
} }
@ -126,21 +127,21 @@ static void ReleaseWallet(CWallet* wallet)
void UnloadWallet(std::shared_ptr<CWallet>&& wallet) void UnloadWallet(std::shared_ptr<CWallet>&& wallet)
{ {
// Mark wallet for unloading. // Mark wallet for unloading.
CWallet* pwallet = wallet.get(); const std::string name = wallet->GetName();
{ {
LOCK(g_wallet_release_mutex); LOCK(g_wallet_release_mutex);
auto it = g_unloading_wallet_set.insert(pwallet); auto it = g_unloading_wallet_set.insert(name);
assert(it.second); assert(it.second);
} }
// The wallet can be in use so it's not possible to explicitly unload here. // The wallet can be in use so it's not possible to explicitly unload here.
// Notify the unload intent so that all remaining shared pointers are // Notify the unload intent so that all remaining shared pointers are
// released. // released.
pwallet->NotifyUnload(); wallet->NotifyUnload();
// Time to ditch our shared_ptr and wait for ReleaseWallet call. // Time to ditch our shared_ptr and wait for ReleaseWallet call.
wallet.reset(); wallet.reset();
{ {
WAIT_LOCK(g_wallet_release_mutex, lock); WAIT_LOCK(g_wallet_release_mutex, lock);
while (g_unloading_wallet_set.count(pwallet) == 1) { while (g_unloading_wallet_set.count(name) == 1) {
g_wallet_release_cv.wait(lock); g_wallet_release_cv.wait(lock);
} }
} }