Remove tally thread and make obsolete tally blocking.

gridcoin-community · Feb 11, 2018 · 564f919 · 564f919
1 parent b33ec57
commit 564f919
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 266 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -25,8 +25,7 @@
 bool LoadAdminMessages(bool bFullTableScan,std::string& out_errors);
 
 StructCPID GetStructCPID();
-void BusyWaitForTally_retired();
-void TallyNetworkAverages_v9(CBlockIndex* index);
+void TallyResearchAverages(CBlockIndex* index);
 extern void ThreadAppInit2(void* parg);
 
 void LoadCPIDs();
@@ -1017,13 +1016,11 @@ bool AppInit2(ThreadHandlerPtr threads)
 
     CBlockIndex* tallyHeight = FindTallyTrigger(pindexBest);
     if(tallyHeight)
-        TallyNetworkAverages_v9(tallyHeight);
+        TallyResearchAverages(tallyHeight);
 
     if (!threads->createThread(StartNode, NULL, "Start Thread"))
         InitError(_("Error: could not start node"));
 
-    BusyWaitForTally_retired();
-
     if (fServer)
         threads->createThread(ThreadRPCServer, NULL, "RPC Server Thread");