Merge pull request #6361

4716267 Use real number of cores for default -par, ignore virtual cores (Wladimir J. van der Laan)
2015-07-02 20:00:41 +02:00
parent 3203a0832a 47162673c7
commit d7ada03b8a
5 changed files with 21 additions and 4 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -546,7 +546,7 @@ void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainpar
        if (Params().DefaultMinerThreads())
            nThreads = Params().DefaultMinerThreads();
        else
-            nThreads = boost::thread::hardware_concurrency();
+            nThreads = GetNumCores();
    }

    if (minerThreads != NULL)