From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Dec 2016 22:58:39 +0000 (-0500)
Subject: common/TrackedOp: drop unneeded _mark_event; pass c string
X-Git-Tag: v12.0.0~45^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c1cbf75236d4465dc97fda79ba8bf8f21d4b9e9;p=ceph.git

common/TrackedOp: drop unneeded _mark_event; pass c string

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

diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index ef59bb8f6e8..de607180263 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -316,23 +316,18 @@ void OpTracker::get_age_ms_histogram(pow2_hist_t *h)
   }
 }
 
-void OpTracker::mark_event(TrackedOp *op, const string &dest, utime_t time)
+void OpTracker::mark_event(TrackedOp *op, const char *evt,
+			   utime_t time)
 {
   if (!op->state)
     return;
-  return _mark_event(op, dest, time);
-}
 
-void OpTracker::_mark_event(TrackedOp *op, const string &evt,
-			    utime_t time)
-{
   dout(5);
-  *_dout  <<  "seq: " << op->seq
-	  << ", time: " << time << ", event: " << evt
-	  << ", op: ";
+  *_dout <<  "seq: " << op->seq
+	 << ", time: " << time << ", event: " << evt
+	 << ", op: ";
   op->_dump_op_descriptor_unlocked(*_dout);
   *_dout << dendl;
-     
 }
 
 void TrackedOp::mark_event(const string &event)
@@ -345,7 +340,7 @@ void TrackedOp::mark_event(const string &event)
     Mutex::Locker l(lock);
     events.push_back(make_pair(now, event));
   }
-  tracker->mark_event(this, event);
+  tracker->mark_event(this, event.c_str());
   _event_marked();
 }
 
diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 924823c10ca..d4247530e5a 100644
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -62,7 +62,6 @@ class OpTracker {
   OpHistory history;
   float complaint_time;
   int log_threshold;
-  void _mark_event(TrackedOp *op, const string &evt, utime_t now);
   bool tracking_enabled;
   RWLock       lock;
 
@@ -96,8 +95,10 @@ public:
    * with a warning string for each old Op.
    * @return True if there are any Ops to warn on, false otherwise.
    */
-  bool check_ops_in_flight(std::vector<string> &warning_strings, int *slow = NULL);
-  void mark_event(TrackedOp *op, const string &evt,
+  bool check_ops_in_flight(std::vector<string> &warning_strings,
+			   int *slow = NULL);
+
+  void mark_event(TrackedOp *op, const char *evt,
 		  utime_t time = ceph_clock_now());
 
   void on_shutdown() {