maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

qt: get required locks upfront in polling functions

Browse source 
This avoids the GUI from getting stuck on
periodical polls if the core is holding the locks for a longer time -
for example, during a wallet rescan.
This commit is contained in:
Wladimir J. van der Laan 2014-04-23 08:40:48 +02:00 committed by langerhans
parent e4da390764
commit 298a7ab2e3
3 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/qt/clientmodel.cpp
View file

@ -83,6 +83,12 @@ double ClientModel::getVerificationProgress() const
void ClientModel::updateTimer() void ClientModel::updateTimer()
{ {
// Get required lock upfront. This avoids the GUI from getting stuck on
// periodical polls if the core is holding the locks for a longer time -
// for example, during a wallet rescan.
TRY_LOCK(cs_main, lockMain);
if(!lockMain)
return;
// Some quantities (such as number of blocks) change so fast that we don't want to be notified for each change. // Some quantities (such as number of blocks) change so fast that we don't want to be notified for each change.
// Periodically check and update with a timer. // Periodically check and update with a timer.
int newNumBlocks = getNumBlocks(); int newNumBlocks = getNumBlocks();

21
src/qt/transactiontablemodel.cpp
View file

@ -24,7 +24,6 @@
#include <QDebug> #include <QDebug>
#include <QIcon> #include <QIcon>
#include <QList> #include <QList>
#include <QTimer>
// Amount column is right-aligned it contains numbers // Amount column is right-aligned it contains numbers
static int column_alignments[] = { static int column_alignments[] = {
@ -187,17 +186,25 @@ public:
{ {
TransactionRecord *rec = &cachedWallet[idx]; TransactionRecord *rec = &cachedWallet[idx];
// Get required locks upfront. This avoids the GUI from getting
// stuck if the core is holding the locks for a longer time - for
// example, during a wallet rescan.
//
// If a status update is needed (blocks came in since last check), // If a status update is needed (blocks came in since last check),
// update the status of this transaction from the wallet. Otherwise, // update the status of this transaction from the wallet. Otherwise,
// simply re-use the cached status. // simply re-use the cached status.
LOCK2(cs_main, wallet->cs_wallet); TRY_LOCK(cs_main, lockMain);
if(rec->statusUpdateNeeded()) if(lockMain)
{ {
std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); TRY_LOCK(wallet->cs_wallet, lockWallet);
if(lockWallet && rec->statusUpdateNeeded())
if(mi != wallet->mapWallet.end())
{ {
rec->updateStatus(mi->second); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
if(mi != wallet->mapWallet.end())
{
rec->updateStatus(mi->second);
}
} }
} }
return rec; return rec;

25
src/qt/walletmodel.cpp
View file

@ -98,18 +98,21 @@ void WalletModel::updateStatus()
void WalletModel::pollBalanceChanged() void WalletModel::pollBalanceChanged()
{ {
bool heightChanged = false; // Get required locks upfront. This avoids the GUI from getting stuck on
{ // periodical polls if the core is holding the locks for a longer time -
LOCK(cs_main); // for example, during a wallet rescan.
if(chainActive.Height() != cachedNumBlocks) TRY_LOCK(cs_main, lockMain);
{ if(!lockMain)
// Balance and number of transactions might have changed return;
cachedNumBlocks = chainActive.Height(); TRY_LOCK(wallet->cs_wallet, lockWallet);
heightChanged = true; if(!lockWallet)
} return;
}
if(heightChanged) if(chainActive.Height() != cachedNumBlocks)
{ {
// Balance and number of transactions might have changed
cachedNumBlocks = chainActive.Height();
checkBalanceChanged(); checkBalanceChanged();
if(transactionTableModel) if(transactionTableModel)
transactionTableModel->updateConfirmations(); transactionTableModel->updateConfirmations();