diff options
| author | Pieter Wuille <[email protected]> | 2017-03-30 12:05:05 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-03-31 12:07:18 +0200 |
| commit | 0b5e162b84ec95cb63903dd21e4003a3d4503421 (patch) | |
| tree | df4b37b863592d5ed0424586021dd8f8e1292eb9 /src/validation.cpp | |
| parent | Merge #10127: [0.14 backport] Mining: Prevent slowdown in CreateNewBlock on l... (diff) | |
| download | discoin-0b5e162b84ec95cb63903dd21e4003a3d4503421.tar.xz discoin-0b5e162b84ec95cb63903dd21e4003a3d4503421.zip | |
Compensate for memory peak at flush time
Github-Pull: #10126
Rebased-From: 7228ce853de5670d559d752f04a7db79578990ea
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index e8a3736e5..5643d2ab5 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2027,7 +2027,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode, int n nLastSetChain = nNow; } int64_t nMempoolSizeMax = GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000; - int64_t cacheSize = pcoinsTip->DynamicMemoryUsage(); + int64_t cacheSize = pcoinsTip->DynamicMemoryUsage() * 2; // Compensate for extra memory peak (x1.5-x1.9) at flush time. int64_t nTotalSpace = nCoinCacheUsage + std::max<int64_t>(nMempoolSizeMax - nMempoolUsage, 0); // The cache is large and we're within 10% and 100 MiB of the limit, but we have time now (not in the middle of a block processing). bool fCacheLarge = mode == FLUSH_STATE_PERIODIC && cacheSize > std::max((9 * nTotalSpace) / 10, nTotalSpace - 100 * 1024 * 1024); |