common/TrackedOp: take option time arg

Fix the callers to use this instead of calling into Tracker directly.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 82aa7881ac888703bb7275ff8623b049d44fe4ac..08a56a0af8a25b4a2c83db7d79685b98b9cb5f4b 100644 (file)
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -330,29 +330,27 @@ void OpTracker::mark_event(TrackedOp *op, const char *evt,
   *_dout << dendl;
 }
 
-void TrackedOp::mark_event(const string &event)
+void TrackedOp::mark_event_string(const string &event, utime_t stamp)
 {
   if (!state)
     return;
 
-  utime_t now = ceph_clock_now();
   {
     Mutex::Locker l(lock);
-    events.push_back(Event(now, event));
+    events.push_back(Event(stamp, event));
   }
   tracker->mark_event(this, event.c_str());
   _event_marked();
 }
 
-void TrackedOp::mark_event(const char *event)
+void TrackedOp::mark_event(const char *event, utime_t stamp)
 {
   if (!state)
     return;
 
-  utime_t now = ceph_clock_now(g_ceph_context);
   {
     Mutex::Locker l(lock);
-    events.push_back(Event(now, event));
+    events.push_back(Event(stamp, event));
   }
   tracker->mark_event(this, event);
   _event_marked();

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 8dda99c65623b7d1ef17c1794e41e1a9c4ba0886..04c997bb2fff29a31b95b38ff99acc91d348945f 100644 (file)
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -249,8 +249,10 @@ public:
       return ceph_clock_now() - get_initiated();
   }
 
-  void mark_event(const string &event);
-  void mark_event(const char *event);
+  void mark_event_string(const string &event,
+                        utime_t stamp=ceph_clock_now());
+  void mark_event(const char *event,
+                 utime_t stamp=ceph_clock_now());
 
   virtual const char *state_string() const {
     Mutex::Locker l(lock);

diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index 8711d9f50a9bf944794f779a749bf2774a555542..a8f66465edf7a7dc70e4f451f135e064d0efb89e 100644 (file)
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -305,11 +305,11 @@ struct MDRequestImpl : public MutationImpl {
     waited_for_osdmap(false), _more(NULL) {
     in[0] = in[1] = NULL;
     if (!params.throttled.is_zero())
-      tracker->mark_event(this, "throttled", params.throttled);
+      mark_event("throttled", params.throttled);
     if (!params.all_read.is_zero())
-      tracker->mark_event(this, "all_read", params.all_read);
+      mark_event("all_read", params.all_read);
     if (!params.dispatched.is_zero())
-      tracker->mark_event(this, "dispatched", params.dispatched);
+      mark_event("dispatched", params.dispatched);
   }
   ~MDRequestImpl();
   

diff --git a/src/mon/MonOpRequest.h b/src/mon/MonOpRequest.h
index af7b23f6bb56662d7ba43262f1df42aee3e5ce34..09ac511700e429914ea7d850beb42c1dcca5a64f 100644 (file)
--- a/src/mon/MonOpRequest.h
+++ b/src/mon/MonOpRequest.h
@@ -95,10 +95,10 @@ private:
     forwarded_to_leader(false),
     op_type(OP_TYPE_NONE)
   {
-    tracker->mark_event(this, "header_read", request->get_recv_stamp());
-    tracker->mark_event(this, "throttled", request->get_throttle_stamp());
-    tracker->mark_event(this, "all_read", request->get_recv_complete_stamp());
-    tracker->mark_event(this, "dispatched", request->get_dispatch_stamp());
+    mark_event("header_read", request->get_recv_stamp());
+    mark_event("throttled", request->get_throttle_stamp());
+    mark_event("all_read", request->get_recv_complete_stamp());
+    mark_event("dispatched", request->get_dispatch_stamp());
 
     if (req) {
       con = req->get_connection();

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 099ca5f3d454bb7d34f894e9a4c6f87d65dd994b..bd4c82b6e1329216ce341420b9dfbdb40f99da2d 100644 (file)
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -40,10 +40,10 @@ OpRequest::OpRequest(Message *req, OpTracker *tracker) :
   } else if (req->get_type() == MSG_OSD_REPOP) {
     reqid = static_cast<MOSDRepOp*>(req)->reqid;
   }
-  tracker->mark_event(this, "header_read", request->get_recv_stamp());
-  tracker->mark_event(this, "throttled", request->get_throttle_stamp());
-  tracker->mark_event(this, "all_read", request->get_recv_complete_stamp());
-  tracker->mark_event(this, "dispatched", request->get_dispatch_stamp());
+  mark_event("header_read", request->get_recv_stamp());
+  mark_event("throttled", request->get_throttle_stamp());
+  mark_event("all_read", request->get_recv_complete_stamp());
+  mark_event("dispatched", request->get_dispatch_stamp());
 }
 
 void OpRequest::_dump(Formatter *f) const