From 52a37a94001e0d10eff49069c37a135ca88bff3f Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Wed, 6 Jan 2010 16:14:45 -0800
Subject: [PATCH] msgr: Remove unregister_entity since there's only ever one
 now. Move needed functionality into the end of dispatch_entry.

---
 src/msg/SimpleMessenger.cc | 25 ++++++-------------------
 src/msg/SimpleMessenger.h  |  1 -
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index db0e2f1bd3d19..3a49d257aadd0 100644
--- 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 71d2794d1df6f..8136981240c62 100644
--- 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);
-- 
2.39.5