diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/compat.h | 1 | ||||
-rw-r--r-- | src/init.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/compat.h b/src/compat.h index 79ebb9323a..706221692b 100644 --- a/src/compat.h +++ b/src/compat.h @@ -11,6 +11,7 @@ #ifndef NOMINMAX #define NOMINMAX #endif +#define FD_SETSIZE 1024 // max number of fds in fd_set #include <winsock2.h> #include <mswsock.h> #include <ws2tcpip.h> diff --git a/src/init.cpp b/src/init.cpp index 8efe6dfdcf..3845cfad81 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -358,7 +358,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" + @@ -544,8 +544,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) |