From 82042adfe0a549276443eafc974f3fca58a60d37 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 17 Nov 2012 20:57:50 -0800 Subject: [PATCH] msg/Pipe: remove useless reader_joining We set it but do not read it. Signed-off-by: Sage Weil --- src/msg/Pipe.cc | 7 ++----- src/msg/Pipe.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index 243cf7a82fe90..e273ad49f2b38 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -62,7 +62,8 @@ Pipe::Pipe(SimpleMessenger *r, int st, Connection *con) state(st), session_security(NULL), connection_state(NULL), - reader_running(false), reader_needs_join(false), reader_joining(false), writer_running(false), + reader_running(false), reader_needs_join(false), + writer_running(false), in_q(&(r->dispatch_queue)), keepalive(false), close_on_empty(false), @@ -138,14 +139,10 @@ void Pipe::join_reader() { if (!reader_running) return; - assert(!reader_joining); - reader_joining = true; cond.Signal(); pipe_lock.Unlock(); reader_thread.join(); pipe_lock.Lock(); - assert(reader_joining); - reader_joining = false; reader_needs_join = false; } diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h index aa2dc1b42e257..cc92b2f6f8b9a 100644 --- a/src/msg/Pipe.h +++ b/src/msg/Pipe.h @@ -113,7 +113,7 @@ class DispatchQueue; utime_t backoff; // backoff time - bool reader_running, reader_needs_join, reader_joining; + bool reader_running, reader_needs_join; bool writer_running; map > out_q; // priority queue for outbound msgs -- 2.39.5