Merge pull request #8 from hd4r/hashrate_calc_threadsafe

Make hashrate calculation thread-safe
VeriumReserve · Oct 9, 2017 · 652f074 · 652f074
2 parents eba1c07 + 1b2b793
commit 652f074
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -544,25 +544,28 @@ void Miner(CWallet *pwallet)
 
                 // Hash meter
                 static int64_t nHashCounter;
-                if (nHPSTimerStart == 0)
-                {
-                    nHPSTimerStart = GetTimeMillis();
-                    nHashCounter = 0;
-                }
-                else
-                    nHashCounter += nHashesDone;
-                if (GetTimeMillis() - nHPSTimerStart > timeElapsed)
                 {
                     static CCriticalSection cs;
                     {
                         LOCK(cs);
-                        if (GetTimeMillis() - nHPSTimerStart > timeElapsed)
+                        if (nHPSTimerStart == 0)
                         {
-                            dHashesPerMin = 60000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);
                             nHPSTimerStart = GetTimeMillis();
                             nHashCounter = 0;
-                            updateHashrate(dHashesPerMin);
-                            printf("Total local hashrate %6.0f hashes/min\n", hashrate);
+                        }
+                        else
+                            nHashCounter += nHashesDone;
+
+                        if (GetTimeMillis() - nHPSTimerStart > timeElapsed)
+                        {
+                            if (GetTimeMillis() - nHPSTimerStart > timeElapsed)
+                            {
+                                dHashesPerMin = 60000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);
+                                nHPSTimerStart = GetTimeMillis();
+                                nHashCounter = 0;
+                                updateHashrate(dHashesPerMin);
+                                printf("Total local hashrate %6.0f hashes/min\n", hashrate);
+                            }
                         }
                     }
                 }