msgr: Remove unregister_entity since there's only ever one now.

Move needed functionality into the end of dispatch_entry.

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index db0e2f1bd3d19903d3284edd7068c36249c28c5d..3a49d257aadd0ca68eab18e33f43a43c32c81f8a 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -340,9 +340,12 @@ void SimpleMessenger::dispatch_entry()
       dispatch_queue.cond.Wait(dispatch_queue.lock); //wait for something to be put on queue
   }
   dispatch_queue.lock.Unlock();
-  dout(15) << "dispatch: ending loop " << dendl;
-  
-  put(); //this thread is shutting down, so one less reference
+
+  //tell everything else it's time to stop
+  lock.Lock();
+  endpoint_stopped = true;
+  wait_cond.Signal();
+  lock.Unlock();
 }
 
 void SimpleMessenger::ready()
@@ -2222,22 +2225,6 @@ bool SimpleMessenger::register_entity(entity_name_t name)
   return true;
 }
 
-
-void SimpleMessenger::unregister_entity(entity_name_t name)
-{
-  lock.Lock();
-  dout(10) << "unregister_entity " << get_myname() << dendl;
-  
-  // remove from local directory.
-  assert(get_myname() == name);
-  endpoint_stopped = true;
-
-  wait_cond.Signal();
-
-  lock.Unlock();
-}
-
-
 void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool lazy)
 {
   const entity_addr_t& dest_addr = dest.addr;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 71d2794d1df6f032e4bb66ec8a249ad97d8d8650..8136981240c6238576229efde72b38110dee7c0b 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -505,7 +505,6 @@ public:
                         bool& isvalid);
 
   bool register_entity(entity_name_t addr);
-  void unregister_entity(entity_name_t addr);
 
   void submit_message(Message *m, const entity_inst_t& addr, bool lazy=false);  
   int send_keepalive(entity_inst_t addr);