From: Haomai Wang <haomaiwang@gmail.com>
Date: Sun, 28 Sep 2014 06:15:43 +0000 (+0800)
Subject: AsyncConnection: Reduce _try_send call
X-Git-Tag: v0.88~37^2~4^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5df3212c0a6413c810645fbe4fa6301b77bc3368;p=ceph.git

AsyncConnection: Reduce _try_send call

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

diff --git a/src/msg/AsyncConnection.cc b/src/msg/AsyncConnection.cc
index 8f91cc9f5721..855a2375080c 100644
--- a/src/msg/AsyncConnection.cc
+++ b/src/msg/AsyncConnection.cc
@@ -1989,23 +1989,21 @@ void AsyncConnection::handle_write()
       keepalive = false;
     }
 
-    bool send = true;
     while (1) {
       Message *m = _get_next_outgoing();
       if (!m)
         break;
 
-      assert(m);
       ldout(async_msgr->cct, 10) << __func__ << " try send msg " << m << dendl;
       r = _send(m);
       if (r < 0) {
         ldout(async_msgr->cct, 1) << __func__ << " send msg failed" << dendl;
         goto fail;
       } else if (r > 0) {
-        send = false;
         break;
       }
     }
+
     if (in_seq > in_seq_acked) {
       ceph_le64 s;
       s = in_seq;
@@ -2013,14 +2011,7 @@ void AsyncConnection::handle_write()
       bl.append((char*)&s, sizeof(s));
       ldout(async_msgr->cct, 10) << __func__ << " try send msg ack" << dendl;
       in_seq_acked = s;
-    }
-
-    r = _try_send(bl, send);
-    if (r < 0) {
-      ldout(async_msgr->cct, 1) << __func__ << " send msg ack failed" << dendl;
-      goto fail;
-    } else if (r > 0) {
-      return ;
+      _try_send(bl, false);
     }
   } else if (state != STATE_CONNECTING) {
     r = _try_send(bl);