Merge bitcoin/bitcoin#26965: refactor: Remove stray cs_main redundant declaration

faba08b5b4 refactor: Remove stray cs_main redundant declaration (MarcoFalke)
fa02591edf doc: Export threadsafety.h from sync.h (MarcoFalke)

Pull request description:

  Looks like this was forgotten when introducing kernel/cs_main ?

  Also, there is a commit to export threadsafety.h from sync.h.

ACKs for top commit:
  hebasto:
    ACK faba08b5b4

Tree-SHA512: 0aa58e7693b6fcd504f9da7339f8baa463a6407f67b27f68002db705f4642321ac3765f16c3d906c925ee24085591b79160a62fa5f4aaf6f2e5dcc788411800d
This commit is contained in:
fanquake
2023-01-30 17:24:24 +00:00
4 changed files with 13 additions and 4 deletions

View File

@@ -48,6 +48,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
" src/node/chainstate.cpp"\ " src/node/chainstate.cpp"\
" src/node/chainstatemanager_args.cpp"\ " src/node/chainstatemanager_args.cpp"\
" src/node/mempool_args.cpp"\ " src/node/mempool_args.cpp"\
" src/node/utxo_snapshot.cpp"\
" src/node/validation_cache_args.cpp"\ " src/node/validation_cache_args.cpp"\
" src/policy/feerate.cpp"\ " src/policy/feerate.cpp"\
" src/policy/packages.cpp"\ " src/policy/packages.cpp"\

View File

@@ -7,12 +7,17 @@
#include <fs.h> #include <fs.h>
#include <logging.h> #include <logging.h>
#include <streams.h> #include <streams.h>
#include <sync.h>
#include <tinyformat.h>
#include <txdb.h>
#include <uint256.h> #include <uint256.h>
#include <util/system.h> #include <util/system.h>
#include <validation.h> #include <validation.h>
#include <cassert>
#include <cstdio> #include <cstdio>
#include <optional> #include <optional>
#include <string>
namespace node { namespace node {

View File

@@ -7,13 +7,16 @@
#define BITCOIN_NODE_UTXO_SNAPSHOT_H #define BITCOIN_NODE_UTXO_SNAPSHOT_H
#include <fs.h> #include <fs.h>
#include <uint256.h> #include <kernel/cs_main.h>
#include <serialize.h> #include <serialize.h>
#include <validation.h> #include <sync.h>
#include <uint256.h>
#include <cstdint>
#include <optional> #include <optional>
#include <string_view>
extern RecursiveMutex cs_main; class Chainstate;
namespace node { namespace node {
//! Metadata describing a serialized version of a UTXO set from which an //! Metadata describing a serialized version of a UTXO set from which an

View File

@@ -11,7 +11,7 @@
#include <logging/timer.h> #include <logging/timer.h>
#endif #endif
#include <threadsafety.h> #include <threadsafety.h> // IWYU pragma: export
#include <util/macros.h> #include <util/macros.h>
#include <condition_variable> #include <condition_variable>