From: Haomai Wang <haomai@xsky.com>
Date: Fri, 6 May 2016 09:31:06 +0000 (+0800)
Subject: DispatchQueue: remove pipe words
X-Git-Tag: v11.0.0~138^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61e60266355adbd49db8349dbd3d1478a4c7231a;p=ceph.git

DispatchQueue: remove pipe words

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc
index 72da51522027..c9770bfb1ce5 100644
--- a/src/msg/DispatchQueue.cc
+++ b/src/msg/DispatchQueue.cc
@@ -141,9 +141,9 @@ void DispatchQueue::dispatch_throttle_release(uint64_t msize)
 
 /*
  * This function delivers incoming messages to the Messenger.
- * Pipes with messages are kept in queues; when beginning a message
- * delivery the highest-priority queue is selected, the pipe from the
- * front of the queue is removed, and its message read. If the pipe
+ * Connections with messages are kept in queues; when beginning a message
+ * delivery the highest-priority queue is selected, the connection from the
+ * front of the queue is removed, and its message read. If the connection
  * has remaining messages at that priority level, it is re-placed on to the
  * end of the queue. If the queue is empty; it's removed.
  * The message is then delivered and the process starts again.
diff --git a/src/msg/DispatchQueue.h b/src/msg/DispatchQueue.h
index 18328c0ce997..57de4ea3e962 100644
--- a/src/msg/DispatchQueue.h
+++ b/src/msg/DispatchQueue.h
@@ -27,13 +27,12 @@
 
 class CephContext;
 class DispatchQueue;
-class Pipe;
 class Messenger;
 class Message;
 struct Connection;
 
 /**
- * The DispatchQueue contains all the Pipes which have Messages
+ * The DispatchQueue contains all the connections which have Messages
  * they want to be dispatched, carefully organized by Message priority
  * and permitted to deliver in a round-robin fashion.
  * See Messenger::dispatch_entry for details.
@@ -88,7 +87,7 @@ class DispatchQueue {
     marrival_map.erase(i);
   }
 
-  uint64_t next_pipe_id;
+  uint64_t next_id;
     
   enum { D_CONNECT = 1, D_ACCEPT, D_BAD_REMOTE_RESET, D_BAD_RESET, D_NUM_CODES };
 
@@ -194,7 +193,7 @@ class DispatchQueue {
   void discard_local();
   uint64_t get_id() {
     Mutex::Locker l(lock);
-    return next_pipe_id++;
+    return next_id++;
   }
   void start();
   void entry();
@@ -207,7 +206,7 @@ class DispatchQueue {
       lock("Messenger::DispatchQueue::lock" + name),
       mqueue(cct->_conf->ms_pq_max_tokens_per_priority,
 	     cct->_conf->ms_pq_min_cost),
-      next_pipe_id(1),
+      next_id(1),
       dispatch_thread(this),
       local_delivery_lock("Messenger::DispatchQueue::local_delivery_lock" + name),
       stop_local_delivery(false),