util, gui: Fix shutdown segfault and repair broken overview page staking status

src/gridcoin/gridcoin.cpp

@@ -18,6 +18,8 @@ extern unsigned int nScraperSleep;
 extern unsigned int nActiveBeforeSB;
 extern bool fScraperActive;
 
+extern ThreadHandler* netThreads;
+
 void Scraper(bool bSingleShot = false);
 void ScraperSubscriber();
 
@@ -150,9 +152,7 @@ void ThreadScraperSubscriber(void* parg)
 //!
 //! \brief Configure and initialize the scraper system.
 //!
-//! \param threads Used to start the scraper housekeeping threads.
-//!
-void InitializeScraper(ThreadHandlerPtr threads)
+void InitializeScraper()
 {
     // Default to 300 sec (5 min), clamp to 60 minimum, 600 maximum - converted to milliseconds.
     nScraperSleep = std::min<int64_t>(std::max<int64_t>(GetArg("-scrapersleep", 300), 60), 600) * 1000;
@@ -174,14 +174,14 @@ void InitializeScraper(ThreadHandlerPtr threads)
     if (GetBoolArg("-scraper", false)) {
         LogPrintf("Gridcoin: scraper enabled");
 
-        if (!threads->createThread(ThreadScraper, nullptr, "ThreadScraper")) {
+        if (!netThreads->createThread(ThreadScraper, nullptr, "ThreadScraper")) {
             LogPrintf("ERROR: createThread(ThreadScraper) failed");
         }
     } else {
         LogPrintf("Gridcoin: scraper disabled");
         LogPrintf("Gridcoin: scraper subscriber housekeeping thread enabled");
 
-        if (!threads->createThread(ThreadScraperSubscriber, nullptr, "ScraperSubscriber")) {
+        if (!netThreads->createThread(ThreadScraperSubscriber, nullptr, "ScraperSubscriber")) {
             LogPrintf("ERROR: createThread(ScraperSubscriber) failed");
         }
     }
@@ -279,7 +279,7 @@ bool fSnapshotRequest = false;
 // Functions
 // -----------------------------------------------------------------------------
 
-bool GRC::Initialize(ThreadHandlerPtr threads, CBlockIndex* pindexBest)
+bool GRC::Initialize(CBlockIndex* pindexBest)
 {
     LogPrintf("Gridcoin: initializing...");
 
@@ -291,7 +291,10 @@ bool GRC::Initialize(ThreadHandlerPtr threads, CBlockIndex* pindexBest)
 
     InitializeContracts(pindexBest);
     InitializeResearcherContext();
-    InitializeScraper(threads);
+
+    // The scraper is run on the netThreads group, because it shares data structures
+    // with scraper_net, which is run as part of the network node threads.
+    InitializeScraper();
     InitializeExplorerFeatures();
 
     return true;

src/gridcoin/gridcoin.h

@@ -7,12 +7,11 @@ namespace GRC {
 //!
 //! \brief Initialize Gridcoin-specific components and services.
 //!
-//! \param threads    Used to start Gridcoin threads.
 //! \param pindexBest Block index for the tip of the chain.
 //!
 //! \return \c false if a problem occurs during initialization.
 //!
-bool Initialize(ThreadHandlerPtr threads, CBlockIndex* pindexBest);
+bool Initialize(CBlockIndex* pindexBest);
 
 //!
 //! \brief Set up Gridcoin-specific background jobs.

src/init.cpp

@@ -107,7 +107,9 @@ void Shutdown(void* parg)
         bitdb.Flush(false);
         StopNode();
         bitdb.Flush(true);
+
         StopRPCThreads();
+
         boost::filesystem::remove(GetPidFile());
         UnregisterWallet(pwalletMain);
         delete pwalletMain;
@@ -1080,8 +1082,6 @@ bool AppInit2(ThreadHandlerPtr threads)
 
     RandAddSeedPerfmon();
 
-    GRC::Initialize(threads, pindexBest);
-
     //// debug print
     if (LogInstance().WillLogCategory(BCLog::LogFlags::VERBOSE))
     {

src/net.cpp

@@ -13,6 +13,7 @@
 #include "init.h"
 #include "ui_interface.h"
 #include "util.h"
+#include "gridcoin/gridcoin.h"
 
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <boost/thread.hpp>
@@ -2318,6 +2319,9 @@ void StartNode(void* parg)
     else
         if (!netThreads->createThread(ThreadStakeMiner,pwalletMain,"ThreadStakeMiner"))
             LogPrintf("Error: createThread(ThreadStakeMiner) failed");
+
+    // Initialize GRC services.
+    GRC::Initialize(pindexBest);
 }
 
 bool StopNode()

src/qt/bitcoingui.cpp

@@ -91,6 +91,8 @@
 extern CWallet* pwalletMain;
 extern std::string FromQString(QString qs);
 
+void GetGlobalStatus();
+
 BitcoinGUI::BitcoinGUI(QWidget *parent):
     QMainWindow(parent),
     clientModel(0),
@@ -177,12 +179,18 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
 
      diagnosticsDialog = new DiagnosticsDialog(this);
 
-
     // Clicking on "Verify Message" in the address book sends you to the verify message tab
     connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
     // Clicking on "Sign Message" in the receive coins page sends you to the sign message tab
     connect(receiveCoinsPage, SIGNAL(signMessage(QString)), this, SLOT(gotoSignMessageTab(QString)));
 
+    QTimer *overview_update_timer = new QTimer(this);
+
+    // Update every 5 seconds.
+    overview_update_timer->start(5 * 1000);
+
+    QObject::connect(overview_update_timer, SIGNAL(timeout()), this, SLOT(updateGlobalStatus()));
+
     gotoOverviewPage();
 }
 
@@ -1264,6 +1272,24 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
         hide();
 }
 
+void BitcoinGUI::updateGlobalStatus()
+{
+    // This is needed to prevent segfaulting due to early GUI initialization compared to core.
+    if (miner_first_pass_complete)
+    {
+        try
+        {
+            GetGlobalStatus();
+            overviewPage->updateglobalstatus();
+            setNumConnections(clientModel->getNumConnections());
+        }
+        catch(std::runtime_error &e)
+        {
+                LogPrintf("GENERAL RUNTIME ERROR!");
+        }
+    }
+}
+
 void BitcoinGUI::toggleHidden()
 {
     showNormalIfMinimized(true);

src/qt/bitcoingui.h

@@ -243,6 +243,8 @@ private slots:
     void updateBeaconIcon();
 
 	QString GetEstimatedStakingFrequency(unsigned int nEstimateTime);
+
+    void updateGlobalStatus();
 };
 
 #endif