From cbb2da8fcf0c81453695c4ec8ce6c467e6a5c8ba Mon Sep 17 00:00:00 2001 From: glozow Date: Thu, 13 Oct 2022 14:37:56 -0400 Subject: add lock annotation for FeeFilterRounder::round() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling WITH_LOCK() on a non-recursive mutex requires not holding it beforehand. Co-authored-by: Niklas Gögge --- src/policy/fees.cpp | 1 + src/policy/fees.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/policy') diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 98b4bdef9b..ab5599a1b4 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -1036,6 +1036,7 @@ FeeFilterRounder::FeeFilterRounder(const CFeeRate& minIncrementalFee) CAmount FeeFilterRounder::round(CAmount currentMinFee) { + AssertLockNotHeld(m_insecure_rand_mutex); std::set::iterator it = m_fee_set.lower_bound(currentMinFee); if (it == m_fee_set.end() || (it != m_fee_set.begin() && diff --git a/src/policy/fees.h b/src/policy/fees.h index c345546895..204c4f2118 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -302,7 +302,7 @@ public: explicit FeeFilterRounder(const CFeeRate& min_incremental_fee); /** Quantize a minimum fee for privacy purpose before broadcast. */ - CAmount round(CAmount currentMinFee); + CAmount round(CAmount currentMinFee) EXCLUSIVE_LOCKS_REQUIRED(!m_insecure_rand_mutex); private: const std::set m_fee_set; -- cgit v1.2.3