msgr: remove refcounting of Messengers.

This was pretty pointless since each Messenger has a well-defined
exit point and shutdown process.

Signed-off-by: Greg Farnum <[email protected]>

src/ceph_mon.cc

@@ -423,7 +423,7 @@ int main(int argc, const char **argv)
 
   store.umount();
   delete mon;
-  messenger->destroy();
+  delete messenger;
 
   // cd on exit, so that gmon.out (if any) goes into a separate directory for each node.
   char s[20];

src/ceph_osd.cc

@@ -431,10 +431,10 @@ int main(int argc, const char **argv)
 
   // done
   delete osd;
-  client_messenger->destroy();
-  messenger_hbin->destroy();
-  messenger_hbout->destroy();
-  cluster_messenger->destroy();
+  delete client_messenger;
+  delete messenger_hbin;
+  delete messenger_hbout;
+  delete cluster_messenger;
 
   // cd on exit, so that gmon.out (if any) goes into a separate directory for each node.
   char s[20];

src/ceph_syn.cc

@@ -102,7 +102,7 @@ int main(int argc, const char **argv, char *envp[])
     // wait for messenger to finish
     delete mclients[i];
     messengers[i]->wait();
-    messengers[i]->destroy();
+    delete messengers[i];
   }
   return 0;
 }

src/libcephfs.cc

@@ -118,7 +118,7 @@ class ceph_mount_info
     }
     if (messenger) {
       messenger->wait();
-      messenger->destroy();
+      delete messenger;
       messenger = NULL;
     }
     if (monclient) {

src/librados.cc

@@ -1028,7 +1028,7 @@ void librados::RadosClient::shutdown()
 librados::RadosClient::~RadosClient()
 {
   if (messenger)
-    messenger->destroy();
+    delete messenger;
   if (objecter)
     delete objecter;
   common_destroy_context(cct);

src/mds/MDS.cc

@@ -180,7 +180,7 @@ MDS::~MDS() {
   }
 
   if (messenger)
-    messenger->destroy();
+    delete messenger;
 }
 
 void MDS::create_logger()

src/mon/MonClient.cc

@@ -258,7 +258,7 @@ int MonClient::get_monmap_privately()
     messenger->shutdown();
     if (smessenger)
       smessenger->wait();
-    messenger->destroy();
+    delete messenger;
     messenger = 0;
     monc_lock.Lock();
   }

src/msg/Messenger.h

@@ -79,26 +79,17 @@ class Messenger {
   /// set to true once the Messenger has started, and set to false on shutdown
   bool started;
 
-  atomic_t nref;
-
  public:
   CephContext *cct;
   Messenger(CephContext *cct_, entity_name_t w)
     : default_send_priority(CEPH_MSG_PRIO_DEFAULT), started(false),
-      nref(1), cct(cct_)
+      cct(cct_)
   {
     _my_name = w;
   }
+  virtual ~Messenger() {}
 
-  void get() {
-    nref.inc();
-  }
-  void put() {
-    if (nref.dec() == 0)
-      delete this;
-  }
   virtual void destroy() {
-    put();
   }
 
   // accessors
@@ -263,12 +254,6 @@ class Messenger {
   virtual Connection *get_connection(const entity_inst_t& dest) = 0;
 
   virtual int rebind(int avoid_port) { return -EOPNOTSUPP; }
-
-protected:
-  //destruction should be handled via destroy()
-  virtual ~Messenger() {
-    assert(nref.read() == 0);
-  }
 };
 
 

src/msg/SimpleMessenger.h

@@ -476,9 +476,7 @@ class SimpleMessenger : public Messenger {
   public:
     ReaperThread(SimpleMessenger *m) : msgr(m) {}
     void *entry() {
-      msgr->get();
       msgr->reaper_entry();
-      msgr->put();
       return 0;
     }
   } reaper_thread;
@@ -519,9 +517,7 @@ class SimpleMessenger : public Messenger {
   public:
     DispatchThread(SimpleMessenger *_messenger) : msgr(_messenger) {}
     void *entry() {
-      msgr->get();
       msgr->dispatch_entry();
-      msgr->put();
       return 0;
     }
   } dispatch_thread;
@@ -553,7 +549,7 @@ class SimpleMessenger : public Messenger {
     dispatch_queue.local_pipe = new Pipe(this, Pipe::STATE_OPEN);
     init_local_pipe();
   }
-  ~SimpleMessenger() {
+  virtual ~SimpleMessenger() {
     delete dispatch_queue.local_pipe;
   }
 

src/tools/common.cc

@@ -698,7 +698,7 @@ int ceph_tool_common_shutdown(CephToolCtx *ctx)
   ctx->timer.shutdown();
   ctx->lock.Unlock();
 
-  messenger->destroy();
+  delete messenger;
   tok_end(tok);
 
   return 0;