Skip to content

Commit 71eef36

Browse files
committed
crimson/common/tri_mutex: add waiter_t::waiter_name
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
1 parent 6c5106d commit 71eef36

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/crimson/common/tri_mutex.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ seastar::future<> tri_mutex::lock_for_read()
7474
return seastar::now();
7575
}
7676
DEBUGDPP("can't lock_for_read, adding to waiters", *this);
77-
waiters.emplace_back(seastar::promise<>(), type_t::read);
77+
waiters.emplace_back(seastar::promise<>(), type_t::read, name);
7878
return waiters.back().pr.get_future();
7979
}
8080

@@ -127,7 +127,7 @@ seastar::future<> tri_mutex::lock_for_write()
127127
return seastar::now();
128128
}
129129
DEBUGDPP("can't lock_for_write, adding to waiters", *this);
130-
waiters.emplace_back(seastar::promise<>(), type_t::write);
130+
waiters.emplace_back(seastar::promise<>(), type_t::write, name);
131131
return waiters.back().pr.get_future();
132132
}
133133

@@ -182,7 +182,7 @@ seastar::future<> tri_mutex::lock_for_excl()
182182
return seastar::now();
183183
}
184184
DEBUGDPP("can't lock_for_excl, adding to waiters", *this);
185-
waiters.emplace_back(seastar::promise<>(), type_t::exclusive);
185+
waiters.emplace_back(seastar::promise<>(), type_t::exclusive, name);
186186
return waiters.back().pr.get_future();
187187
}
188188

@@ -251,7 +251,7 @@ void tri_mutex::wake()
251251
default:
252252
assert(0);
253253
}
254-
// TODO: DEBUGDPP("waking up {} ", *this);
254+
DEBUGDPP("waking up {}", *this, waiter.waiter_name);
255255
waiter.pr.set_value();
256256
waiters.pop_front();
257257
}

src/crimson/common/tri_mutex.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,12 @@ class tri_mutex : private read_lock,
142142
none,
143143
};
144144
struct waiter_t {
145-
waiter_t(seastar::promise<>&& pr, type_t type)
145+
waiter_t(seastar::promise<>&& pr, type_t type, std::string_view waiter_name)
146146
: pr(std::move(pr)), type(type)
147147
{}
148148
seastar::promise<> pr;
149149
type_t type;
150+
std::string_view waiter_name;
150151
};
151152
seastar::circular_buffer<waiter_t> waiters;
152153
const std::string name;

0 commit comments

Comments
 (0)