msgr: Rename SimpleMessenger::start(daemonize, nonce) to start_with_nonce.

Otherwise, once we remove daemonize from the prototype,
all the existing ->start(false) calls will be taken
to mean nonce=0.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>

diff --git a/src/cfuse.cc b/src/cfuse.cc
index ce7f983d103cdd3ba516782b214e2df6cf133bcb..ab8203420102ff451c35aefed6c27113aae19055 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -118,7 +118,7 @@ int main(int argc, const char **argv, const char *envp[]) {
 
     cout << "cfuse[" << getpid() << "]: starting ceph client" << std::endl;
 
-    messenger->start(false, getpid()); // Do not daemonize here
+    messenger->start_with_nonce(false, getpid()); // Do not daemonize here
 
     // start client
     client->init();

diff --git a/src/libceph.cc b/src/libceph.cc
index 5b821b3be5faf050cbc8aa387af400f20880f27a..8ae2177d5d30f95cb8b092aa89ca0aee9ce58d7b 100644 (file)
--- a/src/libceph.cc
+++ b/src/libceph.cc
@@ -93,7 +93,7 @@ public:
       return -1002;
     }
 
-    if (messenger->start(false, msgr_nonce) != 0) {
+    if (messenger->start_with_nonce(false, msgr_nonce) != 0) {
       shutdown();
       return -1003;
     }

diff --git a/src/librados.cc b/src/librados.cc
index 288616ec3cde244e184147103bd0977c4fc6d5f3..80c622de7995815c95a5f79ad09ac9b2a8895ac4 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -649,7 +649,7 @@ connect()
   rados_instance.inc();
   nonce = getpid() + (1000000 * (uint64_t)rados_instance.read());
 
-  messenger->start(false, nonce); // do not daemonize
+  messenger->start_with_nonce(false, nonce); // do not daemonize
   messenger->add_dispatcher_head(this);
 
   dout(1) << "setting wanted keys" << dendl;

diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc
index 71fadb899b4a9be3222cf238d2ec5f8eef57adfc..d029f7de9f48ef2e58f8620dfbe0a4de73b3ae00 100644 (file)
--- a/src/mds/Dumper.cc
+++ b/src/mds/Dumper.cc
@@ -56,7 +56,7 @@ void Dumper::init(int rank)
 
   messenger->register_entity(entity_name_t::CLIENT());
   messenger->add_dispatcher_head(this);
-  messenger->start(false, getpid()); // do not daemonize
+  messenger->start_with_nonce(false, getpid()); // do not daemonize
 
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS);
   monc->set_messenger(messenger);

diff --git a/src/mds/Resetter.cc b/src/mds/Resetter.cc
index 062162faccef951bfec83a82b77e488f4eb6584f..2dc1b0fac7ce6732649ff897c703697a8f12ae24 100644 (file)
--- a/src/mds/Resetter.cc
+++ b/src/mds/Resetter.cc
@@ -50,7 +50,7 @@ void Resetter::init(int rank)
 
   messenger->register_entity(entity_name_t::CLIENT());
   messenger->add_dispatcher_head(this);
-  messenger->start(false, getpid());
+  messenger->start_with_nonce(false, getpid());
 
   monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS);
   monc->set_messenger(messenger);

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 203b032bdd1d305e134482bb582e960bea03718a..e8b2abd74a6e0b06c1f955cf901434c31dadf66e 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -189,7 +189,7 @@ int MonClient::get_monmap_privately()
     messenger = smessenger = new SimpleMessenger();
     smessenger->register_entity(entity_name_t::CLIENT(-1));
     messenger->add_dispatcher_head(this);
-    smessenger->start(false, getpid());  // do not daemonize!
+    smessenger->start_with_nonce(false, getpid());  // do not daemonize!
     temp_msgr = true; 
   }
   

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 82555a42413c80fd8a2155a9f458ca85ab41e9bd..134c0dd62cd8e4bb909bc6c74642c049e7066eb6 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2317,7 +2317,7 @@ int SimpleMessenger::rebind(int avoid_port)
   return accepter.rebind(avoid_port);
 }
 
-int SimpleMessenger::start(bool daemonize, uint64_t nonce)
+int SimpleMessenger::start_with_nonce(bool daemonize, uint64_t nonce)
 {
   lock.Lock();
   dout(1) << "messenger.start" << dendl;

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 6eb282dc37c99ac374a9f7400f42ef1e0b85cf29..753faa7370b6821220ef2321f9d54402faca8fb5 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -564,10 +564,10 @@ public:
   int bind(uint64_t nonce) {
     return bind(g_conf.public_addr, nonce);
   }
-  int start(bool daemonize, uint64_t nonce);  // if we didn't bind
+  int start_with_nonce(bool daemonize, uint64_t nonce);  // if we didn't bind
   int start(bool daemonize) {                 // if we did
     assert(did_bind);
-    return start(daemonize, 0);
+    return start_with_nonce(daemonize, 0);
   }
   void wait();
 

diff --git a/src/tools/common.cc b/src/tools/common.cc
index 4a2b8efb843e66ce41c2d84b41833a303a6977f1..1d614432c169c19da54e48c19c1b44bf4f718827 100644 (file)
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -523,7 +523,7 @@ int ceph_tool_common_init(ceph_tool_mode_t mode)
   // start up network
   messenger = new SimpleMessenger();
   messenger->register_entity(entity_name_t::CLIENT());
-  messenger->start(false, getpid()); // do not daemonize
+  messenger->start_with_nonce(false, getpid()); // do not daemonize
   messenger->add_dispatcher_head(&dispatcher);
 
   g.lock.Lock();