diff options
| author | David Serrano <dserrano5@dserrano5.es> | 2013-04-29 19:35:47 +0200 |
|---|---|---|
| committer | David Serrano <dserrano5@dserrano5.es> | 2013-04-29 19:35:47 +0200 |
| commit | ebd7e8bf917eb18a8d69019cb6d33af08b5c0fc0 (patch) | |
| tree | 4cc9a1583aa14cea51fe36df146e9d339e4c0db5 | |
| parent | 33029bcedd982f80f7e380bff586f3ab644decce (diff) | |
| download | bitcoin-ebd7e8bf917eb18a8d69019cb6d33af08b5c0fc0.tar.xz | |
Accept negative -par values to leave N CPUs free.
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 7024f3f785..c42f1aab03 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -349,7 +349,7 @@ std::string HelpMessage() " -txindex " + _("Maintain a full transaction index (default: 0)") + "\n" + " -loadblock=<file> " + _("Imports blocks from external blk000??.dat file") + "\n" + " -reindex " + _("Rebuild block chain index from current blk000??.dat files") + "\n" + - " -par=<n> " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" + + " -par=N " + _("Set the number of script verification threads (up to 16, 0=auto, negative=leave N CPUs free, default: 0)") + "\n" + "\n" + _("Block creation options:") + "\n" + " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n" + @@ -525,8 +525,8 @@ bool AppInit2(boost::thread_group& threadGroup) // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", 0); - if (nScriptCheckThreads == 0) - nScriptCheckThreads = boost::thread::hardware_concurrency(); + if (nScriptCheckThreads <= 0) + nScriptCheckThreads += boost::thread::hardware_concurrency(); if (nScriptCheckThreads <= 1) nScriptCheckThreads = 0; else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS) |