From 1efccfb35e1620123da89367b9b39419bcb1e9a5 Mon Sep 17 00:00:00 2001
From: sageweil <sageweil@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Fri, 30 Nov 2007 00:13:06 +0000
Subject: [PATCH] cosmetic changes

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2150 29311d96-e01e-0410-9327-a35deaab8ce9
---
 trunk/ceph/msg/SimpleMessenger.cc | 12 ++++++------
 trunk/ceph/msg/SimpleMessenger.h  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/ceph/msg/SimpleMessenger.cc b/trunk/ceph/msg/SimpleMessenger.cc
index e8f94a9876162..c1ab2ee8346fc 100644
--- a/trunk/ceph/msg/SimpleMessenger.cc
+++ b/trunk/ceph/msg/SimpleMessenger.cc
@@ -624,7 +624,7 @@ void Rank::mark_down(entity_addr_t addr)
     Pipe *p = rank_pipe[addr];
     dout(0) << "mark_down " << addr << " -- " << p << dendl;
     p->lock.Lock();
-    p->kill();
+    p->stop();
     p->lock.Unlock();
   } else {
     dout(0) << "mark_down " << addr << " -- pipe dne" << dendl;
@@ -654,12 +654,12 @@ void Rank::mark_down(entity_addr_t addr)
  * 
  * this is controlled by whether accept uses the new incoming socket
  * as the new pipe.  two cases:
- *  old         new
+ *  old         new(incoming)
  *  connecting  connecting   -> use socket initiated by lower address
  *  open        connecting 
  *   -> use new socket _only_ if connect_seq matches.  that is, the
  *      peer reconnected subsequent to the current open socket.  if
- *      connect_seq _doesn't_ match, it means that it is an old attempt.
+ *      connect_seq _doesn't_ match, it means that it is an 'old' attempt.
  */
 
 int Rank::Pipe::accept()
@@ -973,7 +973,7 @@ void Rank::Pipe::fail()
   derr(10) << "fail" << dendl;
   assert(lock.is_locked());
 
-  kill();
+  stop();
 
   // report failures
   q.splice(q.begin(), sent);
@@ -996,9 +996,9 @@ void Rank::Pipe::fail()
   }
 }
 
-void Rank::Pipe::kill()
+void Rank::Pipe::stop()
 {
-  dout(10) << "kill" << dendl;
+  dout(10) << "stop" << dendl;
   assert(lock.is_locked());
 
   cond.Signal();
diff --git a/trunk/ceph/msg/SimpleMessenger.h b/trunk/ceph/msg/SimpleMessenger.h
index b41ff95ea0ad6..8e06f2762ed53 100644
--- a/trunk/ceph/msg/SimpleMessenger.h
+++ b/trunk/ceph/msg/SimpleMessenger.h
@@ -170,7 +170,7 @@ private:
 	reader_thread.join();
       }
     }
-    void kill();
+    void stop();
 
     void send(Message *m) {
       lock.Lock();
-- 
2.39.5