Merge pull request #866 from denravonska/data-race-fixes

Data race fixes

Author: denravonska

src/global_objects_noui.hpp

@@ -7,8 +7,6 @@
 extern int nBoincUtilization;
 extern std::string sRegVer;
 extern int nRegVersion;
-extern bool bCPIDsLoaded;
-extern bool bProjectsInitialized;
 extern bool bNetAveragesLoaded;
 extern bool bForceUpdate;
 extern bool bGlobalcomInitialized;

src/init.cpp

@@ -27,7 +27,7 @@ void BusyWaitForTally_retired();
 void TallyNetworkAverages_v9();
 extern void ThreadAppInit2(void* parg);
 
-void LoadCPIDsInBackground();
+void LoadCPIDs();
 bool IsConfigFileEmpty();
 
 #ifndef WIN32
@@ -990,8 +990,7 @@ bool AppInit2(ThreadHandlerPtr threads)
     uiInterface.InitMessage(_("Compute Neural Network Hashes..."));
     ComputeNeuralNetworkSupermajorityHashes();
 
-    printf("Starting CPID thread...");
-    LoadCPIDsInBackground();  //This calls HarvesCPIDs(true)
+    LoadCPIDs();
 
     uiInterface.InitMessage(_("Finding first applicable Research Project..."));
 

src/main.cpp

@@ -149,7 +149,6 @@ int64_t nLastPing = 0;
 int64_t nLastAskedForBlocks = 0;
 int64_t nBootup = 0;
 int64_t nLastLoadAdminMessages = 0;
-int64_t nCPIDsLoaded = 0;
 int64_t nLastGRCtallied = 0;
 int64_t nLastCleaned = 0;
 
@@ -262,7 +261,6 @@ bool bGridcoinGUILoaded = false;
 extern double LederstrumpfMagnitude2(double Magnitude, int64_t locktime);
 
 extern void WriteAppCache(std::string key, std::string value);
-extern void LoadCPIDsInBackground();
 
 extern void ThreadCPIDs();
 extern void GetGlobalStatus();
@@ -649,14 +647,13 @@ MiningCPID GetNextProject(bool bForce)
 
 
 
-    if ( (IsInitialBlockDownload() || !bCPIDsLoaded) && !bForce)
+    if (IsInitialBlockDownload() && !bForce)
     {
-            if (LessVerbose(100))           printf("CPUMiner: Gridcoin is downloading blocks Or CPIDs are not yet loaded...");
-            MilliSleep(1);
-            return GlobalCPUMiningCPID;
+        if (LessVerbose(100))           printf("CPUMiner: Gridcoin is downloading blocks Or CPIDs are not yet loaded...");
+        MilliSleep(1);
+        return GlobalCPUMiningCPID;
     }
 
-
     try
     {
 
@@ -7715,33 +7712,15 @@ void HarvestCPIDs(bool cleardata)
     {
              printf("Error while harvesting CPIDs 2.\r\n");
     }
-
-
-
 }
 
-
-
-void ThreadCPIDs()
+void LoadCPIDs()
 {
-    RenameThread("grc-cpids");
-    bCPIDsLoaded = false;
+    printf("Load CPID");
     HarvestCPIDs(true);
-    bCPIDsLoaded = true;
-    //CreditCheck(GlobalCPUMiningCPID.cpid,false);
     printf("Getting first project");
     GetNextProject(false);
     printf("Finished getting first project");
-    bProjectsInitialized = true;
-}
-
-
-void LoadCPIDsInBackground()
-{
-      if (IsLockTimeWithinMinutes(nCPIDsLoaded,10)) return;
-      nCPIDsLoaded = GetAdjustedTime();
-      cpidThreads = new boost::thread_group();
-      cpidThreads->create_thread(boost::bind(&ThreadCPIDs));
 }
 
 StructCPID GetStructCPID()

src/miner.cpp

@@ -851,7 +851,6 @@ void StakeMiner(CWallet *pwallet)
 
     while (!fShutdown)
     {
-
         //wait for next round
         MilliSleep(nMinerSleep);
 
@@ -880,6 +879,10 @@ void StakeMiner(CWallet *pwallet)
             continue;
         }
 
+        // Lock main lock since GetNextProject and subsequent calls
+        // require the state to be static.
+        LOCK(cs_main);
+
         GetNextProject(true);
 
         // * Create a bare block
@@ -920,7 +923,6 @@ void StakeMiner(CWallet *pwallet)
         }
 
         // * delegate to ProcessBlock
-        LOCK(cs_main);
         if (!ProcessBlock(NULL, &StakeBlock, true))
         {
             { LOCK(MinerStatus.lock);

src/net.cpp

@@ -1723,10 +1723,6 @@ void static ThreadStakeMiner(void* parg)
 
     if (fDebug10) printf("ThreadStakeMiner started\n");
     CWallet* pwallet = (CWallet*)parg;
-    while (!bCPIDsLoaded)
-    {
-        MilliSleep(100);
-    }
     try
     {
         StakeMiner(pwallet);

src/rpcblockchain.cpp

@@ -22,6 +22,8 @@
 #include <fstream>
 #include <algorithm>
 
+
+bool TallyResearchAverages_v9();
 using namespace json_spirit;
 using namespace std;
 extern std::string YesNo(bool bin);
@@ -2046,7 +2048,7 @@ Value execute(const Array& params, bool fHelp)
     else if (sItem == "tally")
     {
             bNetAveragesLoaded_retired = false;
-            TallyResearchAverages_retired(true);
+            TallyResearchAverages_v9();
             entry.push_back(Pair("Tally Network Averages",1));
             results.push_back(entry);
     }

src/rpcmining.cpp

@@ -20,8 +20,6 @@ int64_t GetCoinYearReward(int64_t nTime);
 
 double GRCMagnitudeUnit(int64_t locktime);
 std::string qtGetNeuralHash(std::string data);
-bool bCPIDsLoaded;
-bool bProjectsInitialized;
 std::string GetNeuralNetworkSupermajorityHash(double& out_popularity);
 
 int64_t GetRSAWeightByCPID(std::string cpid);