X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fkernel.cpp;h=bd8c35757e09b50a1a54ab030854f3a2f7a5d043;hp=3069c2c421399b8d764c63b91168bf72954a2e70;hb=7483713823cea61963ae0051f3e17ffd4b9be706;hpb=fe038d999ac1d67fa617f0a0e7aeae96a4d4cd04 diff --git a/src/kernel.cpp b/src/kernel.cpp index 3069c2c..bd8c357 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -31,12 +31,16 @@ typedef std::map MapModifierCheckpoints; // Hard checkpoints of stake modifiers to ensure they are deterministic static std::map mapStakeModifierCheckpoints = boost::assign::map_list_of - ( 0, 0x0e00670bu ) + ( 0, 0x0e00670bu ) ( 12661, 0x5d84115du ) (143990, 0x9c592c78u ) (149000, 0x48f2bdc4u ) (160000, 0x789df0f0u ) (200000, 0x01ec1503u ) + (221047, 0x0b39ef50u ) + (243100, 0xe928d83au ) + (532000, 0x3e5c2b81u ) + (561108, 0x9c1860b0u ) ; // Hard checkpoints of stake modifiers to ensure they are deterministic (testNet) @@ -161,13 +165,13 @@ static bool SelectBlockFromCandidates(vector >& vSortedBy if (fSelected && hashSelection < hashBest) { hashBest = hashSelection; - *pindexSelected = (const CBlockIndex*) pindex; + *pindexSelected = pindex; } else if (!fSelected) { fSelected = true; hashBest = hashSelection; - *pindexSelected = (const CBlockIndex*) pindex; + *pindexSelected = pindex; } } if (fDebug && GetBoolArg("-printstakemodifier")) @@ -433,9 +437,13 @@ bool ScanKernelForward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxT // TODO: custom threads amount uint32_t nThreads = boost::thread::hardware_concurrency(); + if (nThreads == 0) + { + nThreads = 1; + printf("Warning: hardware_concurrency() failed in %s:%d\n", __FILE__, __LINE__); + } uint32_t nPart = (SearchInterval.second - SearchInterval.first) / nThreads; - KernelWorker *workers = new KernelWorker[nThreads]; boost::thread_group group;