msg/Pipe: remove useless reader_joining

We set it but do not read it.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 243cf7a82fe907347883e76a4058dd9cee6eaabf..e273ad49f2b38e5b1fca6035241b94ddce25d4b2 100644 (file)
--- 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 aa2dc1b42e257e1a5483e99e7184b12f0fe18a41..cc92b2f6f8b9ae87743d14b6feff7fc2609e3c7e 100644 (file)
--- 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<int, list<Message*> > out_q;  // priority queue for outbound msgs