Allocate workers dynamically.

[novacoin.git] / src / kernel.cpp

diff --git a/src/kernel.cpp b/src/kernel.cpp
index b95f4db..55904e1 100644 (file)
--- a/src/kernel.cpp
+++ b/src/kernel.cpp
@@ -444,7 +444,7 @@ class ScanMidstateWorker
 public:
     ScanMidstateWorker()
     { }
-    ScanMidstateWorker(SHA256_CTX ctx, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, std::pair<uint32_t, uint32_t> &SearchInterval)
+    ScanMidstateWorker(SHA256_CTX ctx, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, uint32_t nIntervalBegin, uint32_t nIntervalEnd)
     {
         workerSolutions = vector<std::pair<uint256,uint32_t> >();
 
@@ -452,7 +452,8 @@ public:
         this->nBits = nBits;
         this->nInputTxTime = nInputTxTime;
         this->nValueIn = nValueIn;
-        this->SearchInterval = SearchInterval;
+        this->nIntervalBegin = nIntervalBegin;
+        this->nIntervalEnd = nIntervalEnd;
     }
 
     void Do()
@@ -468,7 +469,7 @@ public:
 
         // Search forward in time from the given timestamp
         // Stopping search in case of shutting down
-        for (uint32_t nTimeTx=SearchInterval.first; nTimeTx<SearchInterval.second && !fShutdown; nTimeTx++)
+        for (uint32_t nTimeTx=nIntervalBegin; nTimeTx<nIntervalEnd && !fShutdown; nTimeTx++)
         {
             // Complete first hashing iteration
             uint256 hash1;
@@ -509,7 +510,8 @@ private:
     uint32_t nBits;
     uint32_t nInputTxTime;
     int64_t nValueIn;
-    std::pair<uint32_t, uint32_t> SearchInterval;
+    uint32_t nIntervalBegin;
+    uint32_t nIntervalEnd;
 };
 
 // Scan given midstate for solution
@@ -517,22 +519,21 @@ bool ScanMidstateForward(SHA256_CTX &ctx, uint32_t nBits, uint32_t nInputTxTime,
 {
     // TODO: custom threads amount
 
+    uint32_t nThreads = boost::thread::hardware_concurrency();
+
     uint32_t nBegin = SearchInterval.first;
     uint32_t nEnd = SearchInterval.second;
     uint32_t nPart = (nEnd - nBegin) / 4;
 
-    ScanMidstateWorker workers[4];
+    ScanMidstateWorker *workers = new ScanMidstateWorker[nThreads];
 
     boost::thread_group group;
-    for(int i = 0; i<4; i++)
+    for(size_t i = 0; i < nThreads; i++)
     {
-        nBegin += (nPart * i);
+        uint32_t nIntervalBegin = nBegin + nPart * i;
         uint32_t nIntervalEnd = nBegin + nPart * (i + 1);
 
-        std::cout << nBegin << " " << nIntervalEnd << std::endl;
-
-        std::pair<uint32_t, uint32_t> interval(nBegin, nIntervalEnd);
-        workers[i] = ScanMidstateWorker(ctx, nBits, nInputTxTime, nValueIn, interval);
+        workers[i] = ScanMidstateWorker(ctx, nBits, nInputTxTime, nValueIn, nIntervalBegin, nIntervalEnd);
 
         boost::function<void()> workerFnc = boost::bind(&ScanMidstateWorker::Do, &workers[i]);
         group.create_thread(workerFnc);
@@ -541,12 +542,14 @@ bool ScanMidstateForward(SHA256_CTX &ctx, uint32_t nBits, uint32_t nInputTxTime,
     group.join_all();
     solutions.clear();
 
-    for(int i = 0; i<4; i++)
+    for(size_t i = 0; i < nThreads; i++)
     {
         std::vector<std::pair<uint256, uint32_t> > ws = workers[i].GetSolutions();
         solutions.insert(solutions.end(), ws.begin(), ws.end());
     }
 
+    delete [] workers;
+
     if (solutions.size() == 0)
     {
         // no solutions