diff options
| author | Matt Corallo <git@bluematt.me> | 2017-04-21 16:38:12 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-06-22 12:21:09 -0400 |
| commit | 309ee1ae7b288deabe6601b054474393f31e1fe7 (patch) | |
| tree | 20239fbd4b7bc256a02e4f129e56143f5ab9641e | |
| parent | b014668e27b496bd6ad30985294f3d6971311910 (diff) | |
| download | bitcoin-309ee1ae7b288deabe6601b054474393f31e1fe7.tar.xz | |
Update -maxsigcachesize doc clarify init logprints for it
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/script/sigcache.cpp | 4 | ||||
| -rw-r--r-- | src/validation.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index aab5670115..df6a762a7a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -461,7 +461,7 @@ std::string HelpMessage(HelpMessageMode mode) { strUsage += HelpMessageOpt("-logtimemicros", strprintf("Add microsecond precision to debug timestamps (default: %u)", DEFAULT_LOGTIMEMICROS)); strUsage += HelpMessageOpt("-mocktime=<n>", "Replace actual time with <n> seconds since epoch (default: 0)"); - strUsage += HelpMessageOpt("-maxsigcachesize=<n>", strprintf("Limit size of signature cache to <n> MiB (default: %u)", DEFAULT_MAX_SIG_CACHE_SIZE)); + strUsage += HelpMessageOpt("-maxsigcachesize=<n>", strprintf("Limit sum of signature cache and script execution cache sizes to <n> MiB (default: %u)", DEFAULT_MAX_SIG_CACHE_SIZE)); strUsage += HelpMessageOpt("-maxtipage=<n>", strprintf("Maximum tip age in seconds to consider node in initial block download (default: %u)", DEFAULT_MAX_TIP_AGE)); } strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)"), diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index bf0e006068..66aa7ad3e3 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -76,8 +76,8 @@ void InitSignatureCache() // setup_bytes creates the minimum possible cache (2 elements). size_t nMaxCacheSize = std::min(std::max((int64_t)0, GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) / 2), MAX_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20); size_t nElems = signatureCache.setup_bytes(nMaxCacheSize); - LogPrintf("Using %zu MiB out of %zu requested for signature cache, able to store %zu elements\n", - (nElems*sizeof(uint256)) >>20, nMaxCacheSize>>20, nElems); + LogPrintf("Using %zu MiB out of %zu/2 requested for signature cache, able to store %zu elements\n", + (nElems*sizeof(uint256)) >>20, (nMaxCacheSize*2)>>20, nElems); } bool CachingTransactionSignatureChecker::VerifySignature(const std::vector<unsigned char>& vchSig, const CPubKey& pubkey, const uint256& sighash) const diff --git a/src/validation.cpp b/src/validation.cpp index 463c16c11f..baddb84be6 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1217,8 +1217,8 @@ void InitScriptExecutionCache() { // setup_bytes creates the minimum possible cache (2 elements). size_t nMaxCacheSize = std::min(std::max((int64_t)0, GetArg("-maxsigcachesize", DEFAULT_MAX_SIG_CACHE_SIZE) / 2), MAX_MAX_SIG_CACHE_SIZE) * ((size_t) 1 << 20); size_t nElems = scriptExecutionCache.setup_bytes(nMaxCacheSize); - LogPrintf("Using %zu MiB out of %zu requested for script execution cache, able to store %zu elements\n", - (nElems*sizeof(uint256)) >>20, nMaxCacheSize>>20, nElems); + LogPrintf("Using %zu MiB out of %zu/2 requested for script execution cache, able to store %zu elements\n", + (nElems*sizeof(uint256)) >>20, (nMaxCacheSize*2)>>20, nElems); } /** |