Add multithreading to RPC searchdzpiv.

presstab · Fuzzbawls · commit 19a0a21c79d5 · 2018-04-26T00:17:30.000-07:00
diff --git a/src/mintpool.cpp b/src/mintpool.cpp
@@ -31,6 +31,8 @@ void CMintPool::Add(const pair<uint256, uint32_t>& pMint)
     insert(pMint);
     if (pMint.second > nCountLastGenerated)
         nCountLastGenerated = pMint.second;
+
+    LogPrintf("%s : add %s count %d to mint pool\n", __func__, pMint.first.GetHex().substr(0, 6), pMint.second);
 }
 
 bool CMintPool::Has(const CBigNum& bnValue)
diff --git a/src/rpcclient.cpp b/src/rpcclient.cpp
@@ -139,6 +139,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
         {"generatemintlist", 1},
         {"searchdzpiv", 0},
         {"searchdzpiv", 1},
+        {"searchdzpiv", 2},
         {"getfeeinfo", 0}
     };
 
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -24,6 +24,7 @@
 #include "spork.h"
 #include "primitives/deterministicmint.h"
 #include <boost/assign/list_of.hpp>
+#include <boost/thread/thread.hpp>
 
 #include <univalue.h>
 
@@ -3412,9 +3413,37 @@ UniValue dzpivstate(const UniValue& params, bool fHelp) {
     return obj;
 }
 
+
+void static SearchThread(CzPIVWallet* zwallet, int nCountStart, int nCountEnd)
+{
+    LogPrintf("%s: start=%d end=%d\n", __func__, nCountStart, nCountEnd);
+    try {
+        uint256 seedMaster = zwallet->GetMasterSeed();
+        for(int i = nCountStart; i < nCountEnd; i++) {
+            boost::this_thread::interruption_point();
+            CDataStream ss(SER_GETHASH, 0);
+            ss << seedMaster << i;
+            uint512 zerocoinSeed = Hash512(ss.begin(), ss.end());
+
+            CBigNum bnValue;
+            CBigNum bnSerial;
+            CBigNum bnRandomness;
+            CKey key;
+            zwallet->SeedToZPIV(zerocoinSeed, bnValue, bnSerial, bnRandomness, key);
+
+            uint256 hashPubcoin = GetPubCoinHash(bnValue);
+            zwallet->AddToMintPool(make_pair(hashPubcoin, i));
+        }
+    } catch (std::exception& e) {
+        LogPrintf("SearchThread() exception");
+    } catch (...) {
+        LogPrintf("SearchThread() exception");
+    }
+}
+
 UniValue searchdzpiv(const UniValue& params, bool fHelp)
 {
-    if(fHelp || params.size() != 2)
+    if(fHelp || params.size() != 3)
         throw runtime_error(
             "searchdzpiv\n"
             "\nMake an extended search for deterministically generated zPIV that have not yet been recognized by the wallet.\n" +
@@ -3423,9 +3452,10 @@ UniValue searchdzpiv(const UniValue& params, bool fHelp)
             "\nArguments\n"
             "1. \"count\"       (numeric) Which sequential zPIV to start with.\n"
             "2. \"range\"       (numeric) How many zPIV to generate.\n"
+            "3. \"threads\"     (numeric) How many threads should this operation consume.\n"
 
             "\nExamples\n" +
-            HelpExampleCli("searchdzpiv", "1, 100") + HelpExampleRpc("searchdzpiv", "1, 100"));
+            HelpExampleCli("searchdzpiv", "1, 100, 2") + HelpExampleRpc("searchdzpiv", "1, 100, 2"));
 
     EnsureWalletIsUnlocked();
 
@@ -3437,8 +3467,23 @@ UniValue searchdzpiv(const UniValue& params, bool fHelp)
     if (nRange < 1)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Range has to be at least 1");
 
+    int nThreads = params[2].get_int();
+
     CzPIVWallet* zwallet = pwalletMain->zwalletMain;
-    zwallet->GenerateMintPool(nCount, nRange);
+
+    boost::thread_group* dzpivThreads = new boost::thread_group();
+    int nRangePerThread = nRange / nThreads;
+
+    int nPrevThreadEnd = nCount - 1;
+    for (int i = 0; i < nThreads; i++) {
+        int nStart = nPrevThreadEnd + 1;;
+        int nEnd = nStart + nRangePerThread;
+        nPrevThreadEnd = nEnd;
+        dzpivThreads->create_thread(boost::bind(&SearchThread, zwallet, nStart, nEnd));
+    }
+
+    dzpivThreads->join_all();
+
     CzPIVTracker* tracker = pwalletMain->zpivTracker;
     zwallet->RemoveMintsFromPool(tracker->GetSerialHashes());
     zwallet->SyncWithChain(false);
diff --git a/src/zpivwallet.cpp b/src/zpivwallet.cpp
@@ -96,6 +96,11 @@ void CzPIVWallet::Lock()
     seedMaster = 0;
 }
 
+void CzPIVWallet::AddToMintPool(const std::pair<uint256, uint32_t>& pMint)
+{
+    mintPool.Add(pMint);
+}
+
 //Add the next 20 mints to the mint pool
 void CzPIVWallet::GenerateMintPool(uint32_t nCountStart, uint32_t nCountEnd)
 {
@@ -222,7 +227,7 @@ void CzPIVWallet::SyncWithChain(bool fGenerateMintPool)
                 CoinDenomination denomination = CoinDenomination::ZQ_ERROR;
                 bool fFoundMint = false;
                 CBigNum bnValue = 0;
-                for (const CTxOut out : tx.vout) {
+                for (const CTxOut& out : tx.vout) {
                     if (!out.scriptPubKey.IsZerocoinMint())
                         continue;
 
diff --git a/src/zpivwallet.h b/src/zpivwallet.h
@@ -23,6 +23,8 @@ class CzPIVWallet
 
 public:
     CzPIVWallet(std::string strWalletFile);
+
+    void AddToMintPool(const std::pair<uint256, uint32_t>& pMint);
     bool SetMasterSeed(const uint256& seedMaster, bool fResetCount = false);
     uint256 GetMasterSeed() { return seedMaster; }
     void SyncWithChain(bool fGenerateMintPool = true);
@@ -37,10 +39,10 @@ class CzPIVWallet
     bool IsInMintPool(const CBigNum& bnValue) { return mintPool.Has(bnValue); }
     void UpdateCount();
     void Lock();
+    void SeedToZPIV(const uint512& seed, CBigNum& bnValue, CBigNum& bnSerial, CBigNum& bnRandomness, CKey& key);
 
 private:
     uint512 GetZerocoinSeed(uint32_t n);
-    void SeedToZPIV(const uint512& seed, CBigNum& bnValue, CBigNum& bnSerial, CBigNum& bnRandomness, CKey& key);
 };
 
 #endif //PIVX_ZPIVWALLET_H

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ void CMintPool::Add(const pair<uint256, uint32_t>& pMint)`
`31`	`31`	`insert(pMint);`
`32`	`32`	`if (pMint.second > nCountLastGenerated)`
`33`	`33`	`nCountLastGenerated = pMint.second;`
	`34`	`+`
	`35`	`+ LogPrintf("%s : add %s count %d to mint pool\n", __func__, pMint.first.GetHex().substr(0, 6), pMint.second);`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`bool CMintPool::Has(const CBigNum& bnValue)`