aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2021-01-11 09:38:14 +0800
committerfanquake <fanquake@gmail.com>2021-01-11 10:14:11 +0800
commitc4458cc3a1d13bc0fb2f9c627e71cd3c8914575d (patch)
treed9f6b2a665a9bdb3da2bf13b70aeea28933df6ae /src/net.h
parent094402430925ec5aac6edbbf52d74f10c665da43 (diff)
parentfad1f0fd33e5e7a65b702237c7ca8e1b694852d2 (diff)
downloadbitcoin-c4458cc3a1d13bc0fb2f9c627e71cd3c8914575d.tar.xz
Merge #18819: net: Replace cs_feeFilter with simple std::atomic
fad1f0fd33e5e7a65b702237c7ca8e1b694852d2 net: Remove unused cs_feeFilter (MarcoFalke) Pull request description: A `RecursiveMutex` is overkill for setting or reading a plain integer. Even a `Mutex` is overkill, when a plain `std::atomic` can be used. This removes 11 lines of code. Also, it is cutting down on the number of locks put on the stack at the same time, which complicates review looking out for potential lock contention. ACKs for top commit: jnewbery: utACK fad1f0fd33e5e7a65b702237c7ca8e1b694852d2 practicalswift: cr ACK fad1f0fd33e5e7a65b702237c7ca8e1b694852d2: patch looks correct Tree-SHA512: 647f9b954fbf52e138d3e710937eb9131b390fef0deae03fd6a162d5a18b9f194010800bbddc8f89208d91be2802dff11c3884d04b3dd233865abd12aa3cde06
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net.h b/src/net.h
index 357b4cc40d..84b5204f14 100644
--- a/src/net.h
+++ b/src/net.h
@@ -565,9 +565,8 @@ public:
std::atomic<std::chrono::seconds> m_last_mempool_req{0s};
std::chrono::microseconds nNextInvSend{0};
- RecursiveMutex cs_feeFilter;
- // Minimum fee rate with which to filter inv's to this node
- CAmount minFeeFilter GUARDED_BY(cs_feeFilter){0};
+ /** Minimum fee rate with which to filter inv's to this node */
+ std::atomic<CAmount> minFeeFilter{0};
CAmount lastSentFeeFilter{0};
int64_t nextSendTimeFeeFilter{0};
};