Improve wallet related and other LOCKs

dexX7 · dexX7 · commit 74df6eb51e8e · 2015-08-14T01:13:17.000+02:00
diff --git a/src/qt/sendmpdialog.cpp b/src/qt/sendmpdialog.cpp
@@ -97,13 +97,13 @@ void SendMPDialog::setWalletModel(WalletModel *model)
 
 void SendMPDialog::updatePropSelector()
 {
+    LOCK(cs_tally);
+
     uint32_t nextPropIdMainEco = GetNextPropertyId(true);  // these allow us to end the for loop at the highest existing
     uint32_t nextPropIdTestEco = GetNextPropertyId(false); // property ID rather than a fixed value like 100000 (optimization)
     QString spId = ui->propertyComboBox->itemData(ui->propertyComboBox->currentIndex()).toString();
     ui->propertyComboBox->clear();
 
-    LOCK(cs_tally);
-
     for (unsigned int propertyId = 1; propertyId < nextPropIdMainEco; propertyId++) {
         if ((global_balance_money[propertyId] > 0) || (global_balance_reserved[propertyId] > 0)) {
             std::string spName = getPropertyName(propertyId);
diff --git a/src/qt/tradehistorydialog.cpp b/src/qt/tradehistorydialog.cpp
@@ -161,7 +161,7 @@ void TradeHistoryDialog::UpdateTradeHistoryTable(bool forceUpdate)
     if (forceUpdate || newTXCount > 0) {
         ui->tradeHistoryTable->setSortingEnabled(false); // disable sorting while we update the table
         QAbstractItemModel* tradeHistoryAbstractModel = ui->tradeHistoryTable->model();
-        int chainHeight = chainActive.Height();
+        int chainHeight = GetHeight();
 
         // Loop through tradeHistoryMap and search tradeHistoryTable for the transaction, adding it if not already there
         for (TradeHistoryMap::iterator it = tradeHistoryMap.begin(); it != tradeHistoryMap.end(); ++it) {
@@ -247,12 +247,11 @@ void TradeHistoryDialog::UpdateTradeHistoryTable(bool forceUpdate)
 // Used to cache trades so we don't need to reparse all our transactions on every update
 int TradeHistoryDialog::PopulateTradeHistoryMap()
 {
-    // Attempt to obtain locks
-    CWallet *wallet = pwalletMain;
-    if (NULL == wallet) return -1;
+    // TODO: locks may not be needed here -- looks like wallet lock can be removed
+    if (NULL == pwalletMain) return -1;
     TRY_LOCK(cs_main,lckMain);
     if (!lckMain) return -1;
-    TRY_LOCK(wallet->cs_wallet, lckWallet);
+    TRY_LOCK(pwalletMain->cs_wallet, lckWallet);
     if (!lckWallet) return -1;
 
     int64_t nProcessed = 0; // number of new entries, forms return code
diff --git a/src/qt/txhistorydialog.cpp b/src/qt/txhistorydialog.cpp
@@ -181,12 +181,12 @@ void TXHistoryDialog::setWalletModel(WalletModel *model)
 
 int TXHistoryDialog::PopulateHistoryMap()
 {
-    CWallet *wallet = pwalletMain;
-    if (NULL == wallet) return 0;
+    // TODO: locks may not be needed here -- looks like wallet lock can be removed
+    if (NULL == pwalletMain) return 0;
     // try and fix intermittent freeze on startup and while running by only updating if we can get required locks
     TRY_LOCK(cs_main,lckMain);
     if (!lckMain) return 0;
-    TRY_LOCK(wallet->cs_wallet, lckWallet);
+    TRY_LOCK(pwalletMain->cs_wallet, lckWallet);
     if (!lckWallet) return 0;
 
     int64_t nProcessed = 0; // counter for how many transactions we've added to history this time
@@ -195,7 +195,6 @@ int TXHistoryDialog::PopulateHistoryMap()
     std::map<std::string,uint256> walletTransactions = FetchWalletOmniTransactions(GetArg("-omniuiwalletscope", 1000));
 
     // reverse iterate over (now ordered) transactions and populate history map for each one
-    Array response;
     for (std::map<std::string,uint256>::reverse_iterator it = walletTransactions.rbegin(); it != walletTransactions.rend(); it++) {
         uint256 txHash = it->second;
 
@@ -227,7 +226,6 @@ int TXHistoryDialog::PopulateHistoryMap()
         uint256 blockHash = 0;
         if (!GetTransaction(txHash, wtx, blockHash, true)) continue;
         if ((0 == blockHash) || (NULL == GetBlockIndex(blockHash))) {
-
             // this transaction is unconfirmed, should be one of our pending transactions
             LOCK(cs_pending);
             PendingMap::iterator pending_it = my_pending.find(txHash);
@@ -269,12 +267,15 @@ int TXHistoryDialog::PopulateHistoryMap()
             uint64_t tmpPropertyId = 0;
             bool bIsBuy = false;
             int numberOfPurchases = 0;
-            LOCK(cs_tally);
-            p_txlistdb->getPurchaseDetails(txHash, 1, &tmpBuyer, &tmpSeller, &tmpVout, &tmpPropertyId, &tmpNValue);
+            {
+                LOCK(cs_tally);
+                p_txlistdb->getPurchaseDetails(txHash, 1, &tmpBuyer, &tmpSeller, &tmpVout, &tmpPropertyId, &tmpNValue);
+            }
             bIsBuy = IsMyAddress(tmpBuyer);
             numberOfPurchases = p_txlistdb->getNumberOfPurchases(txHash);
             if (0 >= numberOfPurchases) continue;
             for (int purchaseNumber = 1; purchaseNumber <= numberOfPurchases; purchaseNumber++) {
+                LOCK(cs_tally);
                 p_txlistdb->getPurchaseDetails(txHash, purchaseNumber, &tmpBuyer, &tmpSeller, &tmpVout, &tmpPropertyId, &tmpNValue);
                 total += tmpNValue;
             }
@@ -340,7 +341,7 @@ int TXHistoryDialog::PopulateHistoryMap()
 
 void TXHistoryDialog::UpdateConfirmations()
 {
-    int chainHeight = chainActive.Height(); // get the chain height
+    int chainHeight = GetHeight(); // get the chain height
     int rowCount = ui->txHistoryTable->rowCount();
     for (int row = 0; row < rowCount; row++) {
         int confirmations = 0;
@@ -400,6 +401,7 @@ void TXHistoryDialog::UpdateHistory()
                 QDateTime txTime;
                 QTableWidgetItem *dateCell = new QTableWidgetItem;
                 if (htxo.blockHeight>0) {
+                    LOCK(cs_main);
                     CBlockIndex* pBlkIdx = chainActive[htxo.blockHeight];
                     if (NULL != pBlkIdx) txTime.setTime_t(pBlkIdx->GetBlockTime());
                     dateCell->setData(Qt::DisplayRole, txTime);
