From: Greg Farnum <gregf@hq.newdream.net>
Date: Fri, 8 Jan 2010 00:56:28 +0000 (-0800)
Subject: msgr: rename endpoint_stopped to destination_stopped
X-Git-Tag: v0.19~189
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40c37fcd1ed55fc60bfe446f83d2d5715f0aed3e;p=ceph.git

msgr: rename endpoint_stopped to destination_stopped
---

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 4a156667b53a..c04bcd8e6b67 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -211,7 +211,7 @@ void *SimpleMessenger::Accepter::entry()
       
       messenger->lock.Lock();
 
-      if (!messenger->endpoint_stopped) {
+      if (!messenger->destination_stopped) {
 	Pipe *p = new Pipe(messenger, Pipe::STATE_ACCEPTING);
 	p->sd = sd;
 	p->start_reader();
@@ -343,7 +343,7 @@ void SimpleMessenger::dispatch_entry()
 
   //tell everything else it's time to stop
   lock.Lock();
-  endpoint_stopped = true;
+  destination_stopped = true;
   wait_cond.Signal();
   lock.Unlock();
 }
@@ -1131,7 +1131,7 @@ int SimpleMessenger::Pipe::connect()
       backoff = utime_t();
       dout(20) << "connect success " << connect_seq << ", lossy = " << policy.lossy << dendl;
       
-      if (!messenger->endpoint_stopped) {
+      if (!messenger->destination_stopped) {
 	Connection * cstate = connection_state->get();
 	pipe_lock.Unlock();
 	messenger->dispatch_queue.queue_connect(cstate);
@@ -1328,7 +1328,7 @@ void SimpleMessenger::Pipe::fail()
 
   discard_queue();
   
-  if (!messenger->endpoint_stopped) {
+  if (!messenger->destination_stopped) {
     Connection * cstate = connection_state->get();
     pipe_lock.Unlock();
     messenger->dispatch_queue.queue_reset(cstate);
@@ -1343,7 +1343,7 @@ void SimpleMessenger::Pipe::was_session_reset()
   dout(10) << "was_session_reset" << dendl;
   discard_queue();
 
-  if (!messenger->endpoint_stopped) {
+  if (!messenger->destination_stopped) {
     Connection * cstate = connection_state->get();
     pipe_lock.Unlock();
     messenger->dispatch_queue.queue_remote_reset(cstate);
@@ -2203,7 +2203,7 @@ bool SimpleMessenger::register_entity(entity_name_t name)
   dout(10) << "register_entity " << name << dendl;
   lock.Lock();
   
-  if (!endpoint_stopped) { //already have a working entity set
+  if (!destination_stopped) { //already have a working entity set
     lock.Unlock();
     return false;
   }
@@ -2216,7 +2216,7 @@ bool SimpleMessenger::register_entity(entity_name_t name)
   else
     my_type = name.type();
 
-  endpoint_stopped = false;
+  destination_stopped = false;
 
   dout(10) << "register_entity " << name << " at " << get_myaddr() << dendl;
 
@@ -2239,7 +2239,7 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool
   {
     // local?
     if (ms_addr.is_local_to(dest_addr)) {
-      if (dest_addr.get_erank() == 0 && !endpoint_stopped) {
+      if (dest_addr.get_erank() == 0 && !destination_stopped) {
         // local
         dout(20) << "submit_message " << *m << " local" << dendl;
 	dispatch_queue.local_delivery(m, m->get_priority());
@@ -2330,7 +2330,7 @@ void SimpleMessenger::wait()
     // reap dead pipes
     reaper();
 
-    if (endpoint_stopped) {
+    if (destination_stopped) {
       dout(10) << "wait: everything stopped" << dendl;
       break;   // everything stopped.
     }
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 928bb2d2c991..071660294f90 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -403,7 +403,7 @@ private:
   entity_addr_t ms_addr;
   
   // local
-  bool endpoint_stopped;
+  bool destination_stopped;
   
   // remote
   hash_map<entity_addr_t, Pipe*> rank_pipe;
@@ -477,7 +477,7 @@ public:
     Messenger(entity_name_t()),
     accepter(this),
     lock("SimpleMessenger::lock"), started(false), did_bind(false), need_addr(true),
-    endpoint_stopped(true), my_type(-1),
+    destination_stopped(true), my_type(-1),
     global_seq_lock("SimpleMessenger::global_seq_lock"), global_seq(0),
     dispatch_thread(this), messenger(this) {
     // for local dmsg delivery