From a5c28ac7881735bd0f1a92668833b0cfe2f05b3a Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 20 Jun 2024 17:46:11 -0700 Subject: [PATCH] crimson/.../tri_mutex: no need to store waiter_name on waiter_t It's going to be the same as tri_mutex::name for any waiter on a tri_mutex. Signed-off-by: Samuel Just --- src/crimson/common/tri_mutex.cc | 8 ++++---- src/crimson/common/tri_mutex.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/crimson/common/tri_mutex.cc b/src/crimson/common/tri_mutex.cc index 83fa381920e84..f6aabc8fd7ef8 100644 --- a/src/crimson/common/tri_mutex.cc +++ b/src/crimson/common/tri_mutex.cc @@ -54,7 +54,7 @@ seastar::future<> tri_mutex::lock_for_read() return seastar::now(); } DEBUGDPP("can't lock_for_read, adding to waiters", *this); - waiters.emplace_back(seastar::promise<>(), type_t::read, name); + waiters.emplace_back(seastar::promise<>(), type_t::read); return waiters.back().pr.get_future(); } @@ -97,7 +97,7 @@ seastar::future<> tri_mutex::lock_for_write() return seastar::now(); } DEBUGDPP("can't lock_for_write, adding to waiters", *this); - waiters.emplace_back(seastar::promise<>(), type_t::write, name); + waiters.emplace_back(seastar::promise<>(), type_t::write); return waiters.back().pr.get_future(); } @@ -141,7 +141,7 @@ seastar::future<> tri_mutex::lock_for_excl() return seastar::now(); } DEBUGDPP("can't lock_for_excl, adding to waiters", *this); - waiters.emplace_back(seastar::promise<>(), type_t::exclusive, name); + waiters.emplace_back(seastar::promise<>(), type_t::exclusive); return waiters.back().pr.get_future(); } @@ -210,7 +210,7 @@ void tri_mutex::wake() default: assert(0); } - DEBUGDPP("waking up {}", *this, waiter.waiter_name); + DEBUGDPP("waking up", *this); waiter.pr.set_value(); waiters.pop_front(); } diff --git a/src/crimson/common/tri_mutex.h b/src/crimson/common/tri_mutex.h index bd3ed6dd4d81e..6dc39656cd362 100644 --- a/src/crimson/common/tri_mutex.h +++ b/src/crimson/common/tri_mutex.h @@ -115,12 +115,11 @@ private: none, }; struct waiter_t { - waiter_t(seastar::promise<>&& pr, type_t type, std::string_view waiter_name) + waiter_t(seastar::promise<>&& pr, type_t type) : pr(std::move(pr)), type(type) {} seastar::promise<> pr; type_t type; - std::string_view waiter_name; }; seastar::circular_buffer waiters; const std::string name; -- 2.39.5