diff options
author | fanquake <fanquake@gmail.com> | 2022-12-08 15:08:06 +0000 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-12-08 15:35:28 +0000 |
commit | 07ac7a2dbf055f44aefad3c7366c844686e9d5c1 (patch) | |
tree | aff3eff34aec1dba0a5adc85401fe25999bdac35 /src/validation.h | |
parent | 1801d8c3c900d0c3a0d05f9ec096419e3f286f6b (diff) | |
parent | 07dfbb5bb8115c680621f361c65d9cde2f8c52f2 (diff) |
Merge bitcoin/bitcoin#26513: Make static nLastFlush and nLastWrite Chainstate members
07dfbb5bb8115c680621f361c65d9cde2f8c52f2 Make static nLastFlush and nLastWrite Chainstate members (Aurèle Oulès)
Pull request description:
Fixes #22189.
The `static std::multimap<uint256, FlatFilePos> mapBlocksUnknownParent; ` referenced in the issue was already fixed by #25571. I don't believe Chainstate references any other static variables.
ACKs for top commit:
jamesob:
ACK 07dfbb5bb8115c680621f361c65d9cde2f8c52f2 ([`jamesob/ackr/26513.1.aureleoules.make_static_nlastflush_a`](https://github.com/jamesob/bitcoin/tree/ackr/26513.1.aureleoules.make_static_nlastflush_a))
theStack:
Concept and code-review ACK 07dfbb5bb8115c680621f361c65d9cde2f8c52f2
Tree-SHA512: 0f26463c079bbc5e0e62707d4ca4c8c9bbb99edfa3391d48d4915d24e2a1190873ecd4f9f11da25b44527671cdc82c41fd8234d56a4592a246989448d34406b0
Diffstat (limited to 'src/validation.h')
-rw-r--r-- | src/validation.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/validation.h b/src/validation.h index a080d12fe2..00f7265793 100644 --- a/src/validation.h +++ b/src/validation.h @@ -743,6 +743,9 @@ private: void UpdateTip(const CBlockIndex* pindexNew) EXCLUSIVE_LOCKS_REQUIRED(::cs_main); + std::chrono::microseconds m_last_write{0}; + std::chrono::microseconds m_last_flush{0}; + friend ChainstateManager; }; |