mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-22 05:30:21 +01:00
kernel: De-globalize signature cache
Move its ownership to the ChainstateManager class. Next to simplifying usage of the kernel library by no longer requiring manual setup of the cache prior to using validation code, it also slims down the amount of memory allocated by BasicTestingSetup. Use this opportunity to make SignatureCache RAII styled Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
This commit is contained in:
@@ -63,6 +63,7 @@ util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManage
|
||||
// 2. Multiply first, divide after to avoid integer truncation.
|
||||
size_t clamped_size_each = std::max<int64_t>(*max_size, 0) * (1 << 20) / 2;
|
||||
opts.script_execution_cache_bytes = clamped_size_each;
|
||||
opts.signature_cache_bytes = clamped_size_each;
|
||||
}
|
||||
|
||||
return {};
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
// Copyright (c) 2022 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <node/validation_cache_args.h>
|
||||
|
||||
#include <kernel/validation_cache_sizes.h>
|
||||
|
||||
#include <common/args.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
using kernel::ValidationCacheSizes;
|
||||
|
||||
namespace node {
|
||||
void ApplyArgsManOptions(const ArgsManager& argsman, ValidationCacheSizes& cache_sizes)
|
||||
{
|
||||
if (auto max_size = argsman.GetIntArg("-maxsigcachesize")) {
|
||||
// 1. When supplied with a max_size of 0, both InitSignatureCache and
|
||||
// InitScriptExecutionCache create the minimum possible cache (2
|
||||
// elements). Therefore, we can use 0 as a floor here.
|
||||
// 2. Multiply first, divide after to avoid integer truncation.
|
||||
size_t clamped_size_each = std::max<int64_t>(*max_size, 0) * (1 << 20) / 2;
|
||||
cache_sizes = {
|
||||
.signature_cache_bytes = clamped_size_each,
|
||||
};
|
||||
}
|
||||
}
|
||||
} // namespace node
|
||||
@@ -1,17 +0,0 @@
|
||||
// Copyright (c) 2022 The Bitcoin Core developers
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef BITCOIN_NODE_VALIDATION_CACHE_ARGS_H
|
||||
#define BITCOIN_NODE_VALIDATION_CACHE_ARGS_H
|
||||
|
||||
class ArgsManager;
|
||||
namespace kernel {
|
||||
struct ValidationCacheSizes;
|
||||
};
|
||||
|
||||
namespace node {
|
||||
void ApplyArgsManOptions(const ArgsManager& argsman, kernel::ValidationCacheSizes& cache_sizes);
|
||||
} // namespace node
|
||||
|
||||
#endif // BITCOIN_NODE_VALIDATION_CACHE_ARGS_H
|
||||
Reference in New Issue
Block a user