diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-30 10:54:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-30 11:06:33 +0200 |
| commit | efec4ec6c55562390908e5170d4451f5212aa538 (patch) | |
| tree | 35a065e77f7f29561cb7d9ae3739c8481b1cb038 /src/init.cpp | |
| parent | 51cb5468862fb7f6d9ac2ae3a1bdb48a8b339ff7 (diff) | |
| parent | d70bc52ee31b8c4c87ee011625e7031c2dc89c0c (diff) | |
| download | bitcoin-efec4ec6c55562390908e5170d4451f5212aa538.tar.xz | |
Merge pull request #4593
d70bc52 Rework block processing benchmark code (Pieter Wuille)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 14816f5016..b84c233b99 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -287,7 +287,6 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += "\n" + _("Debugging/Testing options:") + "\n"; if (GetBoolArg("-help-debug", false)) { - strUsage += " -benchmark " + _("Show benchmark information (default: 0)") + "\n"; strUsage += " -checkpoints " + _("Only accept block chain matching built-in checkpoints (default: 1)") + "\n"; strUsage += " -dblogsize=<n> " + _("Flush database activity from memory pool to disk log every <n> megabytes (default: 100)") + "\n"; strUsage += " -disablesafemode " + _("Disable safemode, override a real safe mode event (default: 0)") + "\n"; @@ -300,7 +299,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -debug=<category> " + _("Output debugging information (default: 0, supplying <category> is optional)") + "\n"; strUsage += " " + _("If <category> is not supplied, output all debugging information.") + "\n"; strUsage += " " + _("<category> can be:"); - strUsage += " addrman, alert, coindb, db, lock, rand, rpc, selectcoins, mempool, net"; // Don't translate these and qt below + strUsage += " addrman, alert, bench, coindb, db, lock, rand, rpc, selectcoins, mempool, net"; // Don't translate these and qt below if (mode == HMM_BITCOIN_QT) strUsage += ", qt"; strUsage += ".\n"; @@ -601,7 +600,9 @@ bool AppInit2(boost::thread_group& threadGroup) if (GetBoolArg("-tor", false)) return InitError(_("Error: Unsupported argument -tor found, use -onion.")); - fBenchmark = GetBoolArg("-benchmark", false); + if (GetBoolArg("-benchmark", false)) + InitWarning(_("Warning: Unsupported argument -benchmark ignored, use -debug=bench.")); + // Checkmempool defaults to true in regtest mode mempool.setSanityCheck(GetBoolArg("-checkmempool", Params().DefaultCheckMemPool())); Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); |