summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-15 14:47:05 -0700
committerSage Weil <sage@inktank.com>2013-07-24 16:20:36 -0700
commit21e27262edc6f5f090ea8915517ee867e30b9066 (patch)
treef8e4b36c5d770395307ad5b5b1541fd4f68a2008
parent25f4786ac41869b3f135bd072000634765bb8919 (diff)
downloadceph-21e27262edc6f5f090ea8915517ee867e30b9066.tar.gz
msg/Pipe: assert lock is held in various helpers
These all require that we hold pipe_lock. Signed-off-by: Sage Weil <sage@inktank.com> (cherry picked from commit 579d858aabbe5df88543d096ef4dbddcfc023cca)
-rw-r--r--src/msg/Pipe.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index e2a155a6038..2ba3505c5a0 100644
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -247,14 +247,17 @@ class DispatchQueue;
void stop();
void _send(Message *m) {
+ assert(pipe_lock.is_locked());
out_q[m->get_priority()].push_back(m);
cond.Signal();
}
void _send_keepalive() {
+ assert(pipe_lock.is_locked());
keepalive = true;
cond.Signal();
}
Message *_get_next_outgoing() {
+ assert(pipe_lock.is_locked());
Message *m = 0;
while (!m && !out_q.empty()) {
map<int, list<Message*> >::reverse_iterator p = out_q.rbegin();