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 <sage.weil@dreamhost.com>

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 34e47d73ff536dc7b96afee407e23538b97b5ac5..2dda6dd230e7bf2794024ed3d0b36f6c7a7bab88 100644 (file)
--- 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
index 4a6320c47c2a51927677f40c7b8b6515b97ee985..0e1e0a95583de6a7d980bb6a73f6a88ada6cc488 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -462,12 +462,6 @@ private:
 
 
   /***** 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);