msgr: join dispatch_thread after it completes

This is just for completeness. No change in behavior, since we don't get here until the thread has signaled it is done. Drop the destroy() overload, since we join earlier. Signed-off-by: Sage Weil <[email protected]>
zmc · Feb 23, 2012 · 962aa3e · 962aa3e
1 parent 761ecc6
commit 962aa3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
@@ -2666,6 +2666,10 @@ void SimpleMessenger::wait()
     wait_cond.Wait(lock);
     ldout(cct,10) << "wait: woke up" << dendl;
   }
+
+  ldout(cct,10) << "wait: join dispatch thread" << dendl;
+  dispatch_thread.join();
+
   ldout(cct,10) << "wait: everything stopped" << dendl;
   lock.Unlock();
 

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
@@ -462,12 +462,6 @@ class SimpleMessenger : public Messenger {
 
 
   /***** Messenger-required functions  **********/
-  void destroy() {
-    if (dispatch_thread.is_started())
-      dispatch_thread.join();
-    Messenger::destroy();
-  }
-
   entity_addr_t get_myaddr();
   void set_ip(entity_addr_t &addr);