AsyncMessenger: Normalise log informations

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/msg/async/AsyncMessenger.cc b/src/msg/async/AsyncMessenger.cc
index 87878c35a0bd9e573b144e438b6dc4516e135618..9075416c66f68b763a183de81ae6d2ba0d966e49 100644 (file)
--- a/src/msg/async/AsyncMessenger.cc
+++ b/src/msg/async/AsyncMessenger.cc
@@ -349,7 +349,7 @@ void AsyncMessenger::ready()
 
 int AsyncMessenger::shutdown()
 {
-  ldout(cct,10) << __func__ << "shutdown " << get_myaddr() << dendl;
+  ldout(cct,10) << __func__ << " " << get_myaddr() << dendl;
   for (vector<Worker*>::iterator it = workers.begin(); it != workers.end(); ++it)
     (*it)->stop();
   mark_down_all();
@@ -443,10 +443,10 @@ void AsyncMessenger::wait()
   did_bind = false;
   ldout(cct,20) << __func__ << ": stopped processor thread" << dendl;
 
-  // close all pipes
+  // close all connections
   lock.Lock();
   {
-    ldout(cct, 10) << __func__ << ": closing pipes" << dendl;
+    ldout(cct, 10) << __func__ << ": closing connections" << dendl;
 
     while (!conns.empty()) {
       AsyncConnectionRef p = conns.begin()->second;
@@ -574,7 +574,7 @@ void AsyncMessenger::submit_message(Message *m, AsyncConnectionRef con,
     return;
   }
 
-  // remote, no existing pipe.
+  // remote, no existing connection.
   const Policy& policy = get_policy(dest_type);
   if (policy.server) {
     ldout(cct, 20) << __func__ << " " << *m << " remote, " << dest_addr
@@ -582,7 +582,7 @@ void AsyncMessenger::submit_message(Message *m, AsyncConnectionRef con,
                    << ceph_entity_type_name(dest_type) << ", no session, dropping." << dendl;
     m->put();
   } else {
-    ldout(cct,20) << __func__ << " " << *m << " remote, " << dest_addr << ", new pipe." << dendl;
+    ldout(cct,20) << __func__ << " " << *m << " remote, " << dest_addr << ", new connection." << dendl;
   }
 }
 
@@ -643,7 +643,7 @@ void AsyncMessenger::mark_down(const entity_addr_t& addr)
     p->get();
     ms_deliver_handle_reset(p.get());
   } else {
-    ldout(cct, 1) << __func__ << " " << addr << " -- pipe dne" << dendl;
+    ldout(cct, 1) << __func__ << " " << addr << " -- connection dne" << dendl;
   }
   lock.Unlock();
 }

diff --git a/src/msg/async/EventEpoll.cc b/src/msg/async/EventEpoll.cc
index a43240b7e36904d8357aef69cf2d39d646ae369f..65e31615fcf47eb2884aceacbba06352c397fcc7 100644 (file)
--- a/src/msg/async/EventEpoll.cc
+++ b/src/msg/async/EventEpoll.cc
@@ -46,6 +46,8 @@ int EpollDriver::init(int nevent)
 
 int EpollDriver::add_event(int fd, int cur_mask, int add_mask)
 {
+  ldout(cct, 20) << __func__ << " add event fd=" << fd << " cur_mask=" << cur_mask
+                 << " add_mask=" << add_mask << dendl;
   struct epoll_event ee;
   /* If the fd was already monitored for some event, we need a MOD
    * operation. Otherwise we need an ADD operation. */
@@ -66,13 +68,13 @@ int EpollDriver::add_event(int fd, int cur_mask, int add_mask)
     return -errno;
   }
 
-  ldout(cct, 10) << __func__ << " add event to fd=" << fd << " mask=" << add_mask
-                 << dendl;
   return 0;
 }
 
 void EpollDriver::del_event(int fd, int cur_mask, int delmask)
 {
+  ldout(cct, 20) << __func__ << " del event fd=" << fd << " cur_mask=" << cur_mask
+                 << " delmask=" << delmask << dendl;
   struct epoll_event ee;
   int mask = cur_mask & (~delmask);
 
@@ -94,8 +96,6 @@ void EpollDriver::del_event(int fd, int cur_mask, int delmask)
                  << " failed." << cpp_strerror(errno) << dendl;
     }
   }
-  ldout(cct, 10) << __func__ << " del event fd=" << fd << " cur mask=" << mask
-                 << dendl;
 }
 
 int EpollDriver::resize_events(int newsize)

diff --git a/src/msg/async/EventKqueue.cc b/src/msg/async/EventKqueue.cc
index 0c1b109f23057b5401d451959d7c9d1d9a93d1dc..13dba68b7e6b467200fd780a89983d7469afc767 100644 (file)
--- a/src/msg/async/EventKqueue.cc
+++ b/src/msg/async/EventKqueue.cc
@@ -46,6 +46,8 @@ int KqueueDriver::init(int nevent)
 
 int KqueueDriver::add_event(int fd, int cur_mask, int add_mask)
 {
+  ldout(cct, 20) << __func__ << " add event fd=" << fd << " cur_mask=" << cur_mask
+                 << "add_mask" << add_mask << dendl;
   struct kevent ke;
   int filter = 0;
   filter |= add_mask & EVENT_READABLE ? EVFILT_READ : 0;
@@ -60,13 +62,13 @@ int KqueueDriver::add_event(int fd, int cur_mask, int add_mask)
     }
   }
 
-  ldout(cct, 10) << __func__ << " add event to fd=" << fd << " mask=" << filter
-                 << dendl;
   return 0;
 }
 
 void KqueueDriver::del_event(int fd, int cur_mask, int delmask)
 {
+  ldout(cct, 20) << __func__ << " del event fd=" << fd << " cur mask=" << cur_mask
+                 << " delmask=" << delmask << dendl;
   struct kevent ee;
   struct kevent ke;
   int filter = 0;
@@ -80,8 +82,6 @@ void KqueueDriver::del_event(int fd, int cur_mask, int delmask)
                  << " failed." << cpp_strerror(errno) << dendl;
     }
   }
-  ldout(cct, 10) << __func__ << " del event fd=" << fd << " cur mask=" << filter
-                 << dendl;
 }
 
 int KqueueDriver::resize_events(int newsize)