From: Sage Weil <sage@inktank.com>
Date: Fri, 27 Sep 2013 22:39:50 +0000 (-0700)
Subject: msgr: debug delay_thread join
X-Git-Tag: v0.71~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9df335b12a093c31f947d5ca98883de9c2a5cf9;p=ceph.git

msgr: debug delay_thread join

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

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 50656fee53b9..66b64d0097a0 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1136,6 +1136,19 @@ void Pipe::unregister_pipe()
   }
 }
 
+void Pipe::join()
+{
+  ldout(msgr->cct, 20) << "join" << dendl;
+  if (writer_thread.is_started())
+    writer_thread.join();
+  if (reader_thread.is_started())
+    reader_thread.join();
+  if (delay_thread) {
+    ldout(msgr->cct, 20) << "joining delay_thread" << dendl;
+    delay_thread->stop();
+    delay_thread->join();
+  }
+}
 
 void Pipe::requeue_sent()
 {
diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index 5f94305350c3..6c91395a352f 100644
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -234,16 +234,7 @@ class DispatchQueue;
 
     void register_pipe();
     void unregister_pipe();
-    void join() {
-      if (writer_thread.is_started())
-        writer_thread.join();
-      if (reader_thread.is_started())
-        reader_thread.join();
-      if (delay_thread) {
-	delay_thread->stop();
-	delay_thread->join();
-      }
-    }
+    void join();
     void stop();
 
     void _send(Message *m) {