Merge #8063: Acquire lock to check for genesis block.

46b0c3b Acquire lock to check for genesis block. (Patrick Strateman)
This commit is contained in:
Pieter Wuille 2016-05-25 16:02:06 +02:00
commit c49c825bd9
No known key found for this signature in database
GPG Key ID: DBA1A67379A1A931

View File

@ -1373,11 +1373,19 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
vImportFiles.push_back(strFile); vImportFiles.push_back(strFile);
} }
threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles)); threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));
if (chainActive.Tip() == NULL) {
LogPrintf("Waiting for genesis block to be imported...\n"); // Wait for genesis block to be processed
while (!fRequestShutdown && chainActive.Tip() == NULL) bool fHaveGenesis = false;
while (!fHaveGenesis && !fRequestShutdown) {
{
LOCK(cs_main);
fHaveGenesis = (chainActive.Tip() != NULL);
}
if (!fHaveGenesis) {
MilliSleep(10); MilliSleep(10);
} }
}
// ********************************************************* Step 11: start node // ********************************************************* Step 11: start node