diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-31 12:06:08 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-31 12:06:14 +0200 |
commit | 9ab26bf7e4284887dcbd40e089f6ee665fabf6cd (patch) | |
tree | bd7b0fa8eec40dffd116fd18a164270d46e5eeb3 | |
parent | ba12b3a844690b50fce9c854725e1142d68599d2 (diff) | |
parent | 7228ce853de5670d559d752f04a7db79578990ea (diff) | |
download | bitcoin-9ab26bf7e4284887dcbd40e089f6ee665fabf6cd.tar.xz |
Merge #10126: Compensate for memory peak at flush time
7228ce8 Compensate for memory peak at flush time (Pieter Wuille)
Tree-SHA512: 97e9848410fab061402c85d8440c54a50dd8a0203b2ea194013ea116700a6dc1b4b26b8c5f9c9c68c1f5c6b935c5d6c737437c1911b003d9ff5445c570cd449d
-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 037b9c0abc..7737c13e6e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2005,7 +2005,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); |