phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-10 11:57:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor: De-globalize last notified header index

Browse source 
In future, users of the kernel library might run multiple chainstates in
parallel, or create and destroy multiple chainstates over the lifetime
of a process. Having static, mutable variables could lead to state
inconsistencies in these scenarios.
This commit is contained in:
TheCharlatan 2024-06-23 12:54:49 +02:00
parent 3443943f86
commit 39f9b80fba
No known key found for this signature in database
GPG key ID: 9B79B45691DB4173
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/validation.cpp
View file

@ -3409,16 +3409,15 @@ static bool NotifyHeaderTip(ChainstateManager& chainman) LOCKS_EXCLUDED(cs_main)
{ {
bool fNotify = false; bool fNotify = false;
bool fInitialBlockDownload = false; bool fInitialBlockDownload = false;
static CBlockIndex* pindexHeaderOld = nullptr;
CBlockIndex* pindexHeader = nullptr; CBlockIndex* pindexHeader = nullptr;
{ {
LOCK(cs_main); LOCK(cs_main);
pindexHeader = chainman.m_best_header; pindexHeader = chainman.m_best_header;
if (pindexHeader != pindexHeaderOld) { if (pindexHeader != chainman.m_last_notified_header) {
fNotify = true; fNotify = true;
fInitialBlockDownload = chainman.IsInitialBlockDownload(); fInitialBlockDownload = chainman.IsInitialBlockDownload();
pindexHeaderOld = pindexHeader; chainman.m_last_notified_header = pindexHeader;
} }
} }
// Send block tip changed notifications without cs_main // Send block tip changed notifications without cs_main

3
src/validation.h
View file

@ -1063,6 +1063,9 @@ public:
/** Best header we've seen so far (used for getheaders queries' starting points). */ /** Best header we've seen so far (used for getheaders queries' starting points). */
CBlockIndex* m_best_header GUARDED_BY(::cs_main){nullptr}; CBlockIndex* m_best_header GUARDED_BY(::cs_main){nullptr};
/** The last header for which a headerTip notification was issued. */
CBlockIndex* m_last_notified_header GUARDED_BY(::cs_main){nullptr};
//! The total number of bytes available for us to use across all in-memory //! The total number of bytes available for us to use across all in-memory
//! coins caches. This will be split somehow across chainstates. //! coins caches. This will be split somehow across chainstates.
int64_t m_total_coinstip_cache{0}; int64_t m_total_coinstip_cache{0};