msgr: switch all users over to abstract interface

This will let us transparently swap implementations out.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index 5697515755bc2670947dd4b0ac853c402c4031f0..807d4839b1aaf355a1b997eef5446cf05789063b 100644 (file)
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -23,7 +23,7 @@ using namespace std;
 #include "client/Client.h"
 #include "client/fuse_ll.h"
 
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include "mon/MonClient.h"
 
@@ -90,9 +90,9 @@ int main(int argc, const char **argv, const char *envp[]) {
     return -1;
 
   // start up network
-  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
-                                                   entity_name_t::CLIENT(),
-                                                   getpid());
+  Messenger *messenger = Messenger::create(g_ceph_context,
+                                          entity_name_t::CLIENT(),
+                                          getpid());
   Client *client = new Client(messenger, &mc);
   if (filer_flags) {
     client->set_filer_flags(filer_flags);

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index a7bc00d1dede1d246089e5690159cc0930d7b33d..acbfa634e455f80b5178c130c5474a921e2a3e74 100644 (file)
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -31,7 +31,7 @@ using namespace std;
 #include "mds/Dumper.h"
 #include "mds/Resetter.h"
 
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include "common/Timer.h"
 #include "common/ceph_argparse.h"
@@ -69,9 +69,9 @@ static int do_cmds_special_action(const std::string &action,
                                  const std::string &dump_file, int rank)
 {
   common_init_finish(g_ceph_context);
-  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
-                                                   entity_name_t::CLIENT(),
-                                                   getpid());
+  Messenger *messenger = Messenger::create(g_ceph_context,
+                                          entity_name_t::CLIENT(),
+                                          getpid());
   int r = messenger->bind(g_conf->public_addr);
   if (r < 0)
     return r;
@@ -231,9 +231,9 @@ int main(int argc, const char **argv)
 
   global_print_banner();
 
-  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
-                                                   entity_name_t::MDS(-1),
-                                                   getpid());
+  Messenger *messenger = Messenger::create(g_ceph_context,
+                                          entity_name_t::MDS(-1),
+                                          getpid());
   messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL);
 
   cout << "starting " << g_conf->name << " at " << messenger->get_myaddr()

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 26898318342e3b55040cb3206bcfafc03499a834..7a35886eb949611a07f2055f55a49773fa21852f 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -29,7 +29,7 @@ using namespace std;
 #include "mon/MonitorStore.h"
 #include "mon/MonClient.h"
 
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include "include/CompatSet.h"
 
@@ -367,9 +367,9 @@ int main(int argc, const char **argv)
 
   // bind
   int rank = monmap.get_rank(g_conf->name.get_id());
-  SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context,
-                                                   entity_name_t::MON(rank),
-                                                   0);
+  Messenger *messenger = Messenger::create(g_ceph_context,
+                                          entity_name_t::MON(rank),
+                                          0);
   messenger->set_cluster_protocol(CEPH_MON_PROTOCOL);
   messenger->set_default_send_priority(CEPH_MSG_PRIO_HIGH);
 

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 7177b32fd2f1ec4643d3d4e69070e12c008e0cf9..340fecefd90ea01ba22817009fe3af9d06c72de7 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -31,7 +31,7 @@ using namespace std;
 #include "mon/MonClient.h"
 
 
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include "common/Timer.h"
 #include "common/ceph_argparse.h"
@@ -300,18 +300,18 @@ int main(int argc, const char **argv)
         << TEXT_NORMAL << dendl;
   }
 
-  SimpleMessenger *client_messenger = new SimpleMessenger(g_ceph_context,
-                                                          entity_name_t::OSD(whoami),
-                                                          getpid());
-  SimpleMessenger *cluster_messenger = new SimpleMessenger(g_ceph_context,
-                                                           entity_name_t::OSD(whoami),
-                                                           getpid());
-  SimpleMessenger *messenger_hbin = new SimpleMessenger(g_ceph_context,
-                                                        entity_name_t::OSD(whoami),
-                                                        getpid());
-  SimpleMessenger *messenger_hbout = new SimpleMessenger(g_ceph_context,
-                                                         entity_name_t::OSD(whoami),
-                                                         getpid());
+  Messenger *client_messenger = Messenger::create(g_ceph_context,
+                                                 entity_name_t::OSD(whoami),
+                                                 getpid());
+  Messenger *cluster_messenger = Messenger::create(g_ceph_context,
+                                                  entity_name_t::OSD(whoami),
+                                                  getpid());
+  Messenger *messenger_hbin = Messenger::create(g_ceph_context,
+                                               entity_name_t::OSD(whoami),
+                                               getpid());
+  Messenger *messenger_hbout = Messenger::create(g_ceph_context,
+                                                entity_name_t::OSD(whoami),
+                                                getpid());
   cluster_messenger->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbin->set_cluster_protocol(CEPH_OSD_PROTOCOL);
   messenger_hbout->set_cluster_protocol(CEPH_OSD_PROTOCOL);

diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 2535af60310c0dd3ee4718b5d7028c96aafe73cb..8eb238ad2b20fb1c911356ee43f7304f39aa360f 100644 (file)
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -22,7 +22,7 @@ using namespace std;
 #include "client/SyntheticClient.h"
 #include "client/Client.h"
 
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include "mon/MonClient.h"
 
@@ -63,14 +63,14 @@ int main(int argc, const char **argv, char *envp[])
 
   list<Client*> clients;
   list<SyntheticClient*> synclients;
-  SimpleMessenger* messengers[g_conf->num_client];
+  Messenger* messengers[g_conf->num_client];
   MonClient* mclients[g_conf->num_client];
 
   cout << "ceph-syn: starting " << g_conf->num_client << " syn client(s)" << std::endl;
   for (int i=0; i<g_conf->num_client; i++) {
-    messengers[i] = new SimpleMessenger(g_ceph_context,
-                                        entity_name_t(entity_name_t::TYPE_CLIENT,-1),
-                                        i * 1000000 + getpid());
+    messengers[i] = Messenger::create(g_ceph_context,
+                                     entity_name_t(entity_name_t::TYPE_CLIENT,-1),
+                                     i * 1000000 + getpid());
     messengers[i]->bind(g_conf->public_addr);
     mclients[i] = new MonClient(g_ceph_context);
     mclients[i]->build_initial_monmap();

diff --git a/src/libcephfs.cc b/src/libcephfs.cc
index b1481e674dcd3936b0cc784f6d1d65ecec7b618e..f70c71a9bdf28574e15bc8cea9e917e29844ae81 100644 (file)
--- a/src/libcephfs.cc
+++ b/src/libcephfs.cc
@@ -22,7 +22,7 @@
 #include "mon/MonClient.h"
 #include "include/str_list.h"
 #include "messages/MMonMap.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 
 #include <fcntl.h>
 #include <iostream>
@@ -77,7 +77,7 @@ public:
       goto fail;
 
     //network connection
-    messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(), msgr_nonce);
+    messenger = Messenger::create(cct, entity_name_t::CLIENT(), msgr_nonce);
 
     //at last the client
     ret = -1002;
@@ -185,7 +185,7 @@ private:
   bool mounted;
   Client *client;
   MonClient *monclient;
-  SimpleMessenger *messenger;
+  Messenger *messenger;
   CephContext *cct;
   std::string cwd;
 };

diff --git a/src/mds/Dumper.h b/src/mds/Dumper.h
index c722f1106dcdd984a1763dde6afddcdffc228163..ec3ad6d1cd508a85672c8190bae4c4a93fea9107 100644 (file)
--- a/src/mds/Dumper.h
+++ b/src/mds/Dumper.h
@@ -19,7 +19,7 @@
 #include "osdc/Journaler.h"
 #include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 #include "auth/Auth.h"
 
 /**
@@ -35,7 +35,7 @@ public:
   Objecter *objecter;
   Journaler *journaler;
   OSDMap *osdmap;
-  SimpleMessenger *messenger;
+  Messenger *messenger;
   MonClient *monc;
   Mutex lock;
   SafeTimer timer;
@@ -43,12 +43,12 @@ public:
   int rank;
 
   /*
-   * The messenger should be a valid SimpleMessenger. You should call bind()
+   * The messenger should be a valid Messenger. You should call bind()
    * before passing it in, but not do anything else.
    * The MonClient needs to be valid, and you should have called
    * build_initial_monmap().
    */
-  Dumper(SimpleMessenger *messenger_, MonClient *monc_) :
+  Dumper(Messenger *messenger_, MonClient *monc_) :
     Dispatcher(messenger_->cct),
     messenger(messenger_),
     monc(monc_),

diff --git a/src/mds/Resetter.h b/src/mds/Resetter.h
index 76e55fe22cf18df58fa359dafdfe6d6371723da9..663dde12f1760567d0e688437465f156604c1f5e 100644 (file)
--- a/src/mds/Resetter.h
+++ b/src/mds/Resetter.h
@@ -19,7 +19,7 @@
 #include "osdc/Journaler.h"
 #include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 #include "auth/Auth.h"
 
 /**
@@ -35,18 +35,18 @@ public:
   Objecter *objecter;
   Journaler *journaler;
   OSDMap *osdmap;
-  SimpleMessenger *messenger;
+  Messenger *messenger;
   MonClient *monc;
   Mutex lock;
   SafeTimer timer;
 
   /*
-   * The messenger should be a valid SimpleMessenger. You should call bind()
+   * The messenger should be a valid Messenger. You should call bind()
    * before passing it in, but not do anything else.
    * The MonClient needs to be valid, and you should have called
    * build_initial_monmap().
    */
-  Resetter(SimpleMessenger *messenger_, MonClient *monc_) :
+  Resetter(Messenger *messenger_, MonClient *monc_) :
     Dispatcher(messenger_->cct),
     messenger(messenger_),
     monc(monc_),

diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index 59ba977ecd5b6ff8ae658304a3b4442a6f32d51e..badad96f5b64eda6be919a9038d92707c85e640e 100644 (file)
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -21,7 +21,7 @@ using namespace std;
 
 #include "mon/MonMap.h"
 #include "mon/MonClient.h"
-#include "msg/SimpleMessenger.h"
+#include "msg/Messenger.h"
 #include "messages/MPing.h"
 
 #include "common/Timer.h"
@@ -96,9 +96,9 @@ int main(int argc, const char **argv, const char *envp[]) {
   std::string sss(ss.str());
   g_ceph_context->_conf->set_val("public_addr", sss.c_str());
   g_ceph_context->_conf->apply_changes(NULL);
-  SimpleMessenger *rank = new SimpleMessenger(g_ceph_context,
-                                              entity_name_t::MON(whoami),
-                                              getpid());
+  Messenger *rank = Messenger::create(g_ceph_context,
+                                     entity_name_t::MON(whoami),
+                                     getpid());
   int err = rank->bind(g_ceph_context->_conf->public_addr);
   if (err < 0)
     return 1;