From: Samuel Just <sjust@redhat.com>
Date: Fri, 21 Jun 2019 00:48:27 +0000 (-0700)
Subject: msg/async: fix timestamp members specific to EVENTTRACE
X-Git-Tag: v15.1.0~1367^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1ca955a6370efc62fe27cf4806864b595757d26;p=ceph.git

msg/async: fix timestamp members specific to EVENTTRACE

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/msg/async/ProtocolV1.cc b/src/msg/async/ProtocolV1.cc
index e950727f82eb..3405bacde4f5 100644
--- a/src/msg/async/ProtocolV1.cc
+++ b/src/msg/async/ProtocolV1.cc
@@ -501,9 +501,6 @@ CtPtr ProtocolV1::handle_message(char *buffer, int r) {
   } else if (tag == CEPH_MSGR_TAG_ACK) {
     return READ(sizeof(ceph_le64), handle_tag_ack);
   } else if (tag == CEPH_MSGR_TAG_MSG) {
-#if defined(WITH_LTTNG) && defined(WITH_EVENTTRACE)
-    ltt_recv_stamp = ceph_clock_now();
-#endif
     recv_stamp = ceph_clock_now();
     ldout(cct, 20) << __func__ << " begin MSG" << dendl;
     return READ(sizeof(ceph_msg_header), handle_message_header);
@@ -982,7 +979,7 @@ CtPtr ProtocolV1::handle_message_footer(char *buffer, int r) {
       message->get_type() == CEPH_MSG_OSD_OPREPLY) {
     utime_t ltt_processed_stamp = ceph_clock_now();
     double usecs_elapsed =
-        (ltt_processed_stamp.to_nsec() - ltt_recv_stamp.to_nsec()) / 1000;
+      ((double)(ltt_processed_stamp.to_nsec() - recv_stamp.to_nsec())) / 1000;
     ostringstream buf;
     if (message->get_type() == CEPH_MSG_OSD_OP)
       OID_ELAPSED_WITH_MSG(message, usecs_elapsed, "TIME_TO_DECODE_OSD_OP",
diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index d47dd3f94abb..bdc78c29bfa9 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -1367,7 +1367,7 @@ CtPtr ProtocolV2::handle_message() {
   ceph_assert(state == THROTTLE_DONE);
 
 #if defined(WITH_EVENTTRACE)
-  ltt_recv_stamp = ceph_clock_now();
+  utime_t ltt_recv_stamp = ceph_clock_now();
 #endif
   recv_stamp = ceph_clock_now();