From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 25 Aug 2015 18:18:07 +0000 (-0400)
Subject: blkin: add traces to XioMessenger
X-Git-Tag: v12.0.3~73^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cc7c062459837a76ac91e071c302704cfea7310;p=ceph.git

blkin: add traces to XioMessenger

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index 248cf9372850..a63f5ffb3d69 100644
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -933,7 +933,10 @@ assert(req->out.pdata_iov.nents || !nbuffers);
      }
     tail->next = NULL;
   }
-  xcon->portal->enqueue(xcon, xmsg);
+  xmsg->trace = m->trace;
+  m->trace.event("xio portal enqueue for send");
+  m->trace.keyval("xio message segments", xmsg->hdr.msg_cnt);
+  xcon->portal->enqueue_for_send(xcon, xmsg);
 
   return code;
 } /* send_message(Message *, Connection *) */
diff --git a/src/msg/xio/XioMsg.cc b/src/msg/xio/XioMsg.cc
index cf7712d39508..8c2d3d8ec061 100644
--- a/src/msg/xio/XioMsg.cc
+++ b/src/msg/xio/XioMsg.cc
@@ -27,6 +27,7 @@ int XioDispatchHook::release_msgs()
   /* queue for release */
   xcmp = static_cast<XioCompletion *>(rsp_pool.alloc(sizeof(XioCompletion)));
   new (xcmp) XioCompletion(xcon, this);
+  xcmp->trace = m->trace;
 
   /* merge with portal traffic */
   xcon->portal->enqueue(xcon, xcmp);
diff --git a/src/msg/xio/XioPortal.h b/src/msg/xio/XioPortal.h
index bbe31ff2b7b9..b3f21010095e 100644
--- a/src/msg/xio/XioPortal.h
+++ b/src/msg/xio/XioPortal.h
@@ -170,6 +170,7 @@ public:
 	xcmp->xcon->msg_release_fail(msg, code);
       msg = next_msg;
     }
+    xcmp->trace.event("xio_release_msg");
     xcmp->finalize(); /* unconditional finalize */
   }
 
@@ -273,6 +274,7 @@ public:
 		  goto restart;
 		}
 
+		xs->trace.event("xio_send_msg");
 		msg = xsend->get_xio_msg();
 		code = xio_send_msg(xcon->conn, msg);
 		/* header trace moved here to capture xio serial# */
diff --git a/src/msg/xio/XioSubmit.h b/src/msg/xio/XioSubmit.h
index dcb6eb14e005..9840ad4a449c 100644
--- a/src/msg/xio/XioSubmit.h
+++ b/src/msg/xio/XioSubmit.h
@@ -40,6 +40,7 @@ public:
   enum submit_type type;
   bi::list_member_hook<> submit_list;
   XioConnection *xcon;
+  ZTracer::Trace trace;
 
   XioSubmit(enum submit_type _type, XioConnection *_xcon) :
     type(_type), xcon(_xcon)