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

Merge #18160: gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged

Browse Source 
0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37 gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged (João Barbosa)

Pull request description:

  Each 250ms the slot `WalletModel::pollBalanceChanged` is called which, at worst case, calls `Wallet::GetBalance`. This is a waste of resources since most of the time there aren't new transactions or new blocks. Fix this by early checking if cache is dirty or not.

  The actual balance computation can still hang the GUI thread but that is tracked in #16874 and should be fixed with a solution similar to #17135.

ACKs for top commit:
  hebasto:
    ACK 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged.
  jonasschnelli:
    utACK 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37
  instagibbs:
    ACK 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37
  ryanofsky:
    Code review ACK 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37, but I would prefer (not strongly) for #17905 to be merged first. This PR can be simpler if it is based on #17905, so tryGetBalances can just be left alone instead of changing into to a more complicated tryGetBalancesIfNeeded function, and then getting changed back later when we want to optimize it out.
  jonatack:
    ACK 0933a37078e based primarily on code review, despite a lot of manual testing with a large 177MB wallet.

Tree-SHA512: 18db35bf33a7577666658c8cb0b57308c8474baa5ea95bf1468cd8531a69857d8915584f6ac505874717aa6aabeb1b506ac77630f8acdb6651afab89275e38a1
This commit is contained in:
Wladimir J. van der Laan 2020-03-31 13:48:52 +02:00 committed by PastaPastaPasta
parent 0b8e501b51
commit 9a84f7ef76
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/wallet.h
View File

@ -229,8 +229,11 @@ public:
//! Get balances. //! Get balances.
virtual WalletBalances getBalances() = 0; virtual WalletBalances getBalances() = 0;
//! Get balances if possible without blocking. //! Get balances if possible without waiting for chain and wallet locks.
virtual bool tryGetBalances(WalletBalances& balances, uint256& block_hash) = 0; virtual bool tryGetBalances(WalletBalances& balances,
uint256& block_hash,
bool force,
const uint256& cached_last_update_tip) = 0;
//! Get balance. //! Get balance.
virtual CAmount getBalance() = 0; virtual CAmount getBalance() = 0;

5
src/qt/walletmodel.cpp
View File

@ -101,12 +101,10 @@ void WalletModel::pollBalanceChanged()
// rescan. // rescan.
interfaces::WalletBalances new_balances; interfaces::WalletBalances new_balances;
uint256 block_hash; uint256 block_hash;
if (!m_wallet->tryGetBalances(new_balances, block_hash)) { if (!m_wallet->tryGetBalances(new_balances, block_hash, fForceCheckBalanceChanged, m_cached_last_update_tip)) {
return; return;
} }
if (fForceCheckBalanceChanged || block_hash != m_cached_last_update_tip || node().coinJoinOptions().getRounds() != cachedCoinJoinRounds)
{
fForceCheckBalanceChanged = false; fForceCheckBalanceChanged = false;
// Balance and number of transactions might have changed // Balance and number of transactions might have changed
@ -117,7 +115,6 @@ void WalletModel::pollBalanceChanged()
if(transactionTableModel) if(transactionTableModel)
transactionTableModel->updateConfirmations(); transactionTableModel->updateConfirmations();
} }
}
void WalletModel::checkBalanceChanged(const interfaces::WalletBalances& new_balances) void WalletModel::checkBalanceChanged(const interfaces::WalletBalances& new_balances)
{ {

5
src/wallet/interfaces.cpp
View File

@ -434,13 +434,14 @@ public:
} }
return result; return result;
} }
bool tryGetBalances(WalletBalances& balances, uint256& block_hash) override bool tryGetBalances(WalletBalances& balances, uint256& block_hash, bool force, const uint256& cached_last_update_tip) override
{ {
block_hash = m_wallet->GetLastBlockHash();
if (!force && block_hash == cached_last_update_tip) return false;
TRY_LOCK(m_wallet->cs_wallet, locked_wallet); TRY_LOCK(m_wallet->cs_wallet, locked_wallet);
if (!locked_wallet) { if (!locked_wallet) {
return false; return false;
} }
block_hash = m_wallet->GetLastBlockHash();
balances = getBalances(); balances = getBalances();
return true; return true;
} }