From: Samuel Just <sam.just@inktank.com>
Date: Wed, 20 Mar 2013 18:49:03 +0000 (-0700)
Subject: OpRequest: use OpRequestRef for OpHistory
X-Git-Tag: v0.62~191^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51ae509800bb80c5e5df7bb5d4b4c98193377fdf;p=ceph.git

OpRequest: use OpRequestRef for OpHistory

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index b3d95367ec59..2b44f16abebc 100644
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -30,11 +30,11 @@ void OpHistory::insert(utime_t now, OpRequest *op)
 void OpHistory::cleanup(utime_t now)
 {
   while (arrived.size() &&
-	 now - arrived.begin()->first > (double)(g_conf->osd_op_history_duration)) {
+	 (now - arrived.begin()->first >
+	  (double)(g_conf->osd_op_history_duration))) {
     duration.erase(make_pair(
 	arrived.begin()->second->get_duration(),
 	arrived.begin()->second));
-    delete arrived.begin()->second;
     arrived.erase(arrived.begin());
   }
 
@@ -42,7 +42,6 @@ void OpHistory::cleanup(utime_t now)
     arrived.erase(make_pair(
 	duration.begin()->second->get_arrived(),
 	duration.begin()->second));
-    delete duration.begin()->second;
     duration.erase(duration.begin());
   }
 }
@@ -55,7 +54,7 @@ void OpHistory::dump_ops(utime_t now, Formatter *f)
   f->dump_int("duration to keep", g_conf->osd_op_history_duration);
   {
     f->open_array_section("Ops");
-    for (set<pair<utime_t, const OpRequest *> >::const_iterator i =
+    for (set<pair<utime_t, OpRequestRef> >::const_iterator i =
 	   arrived.begin();
 	 i != arrived.end();
 	 ++i) {
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index e12fbe00c53d..65f4cc471ea0 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -26,18 +26,17 @@
 #include "osd/osd_types.h"
 
 class OpRequest;
+typedef std::tr1::shared_ptr<OpRequest> OpRequestRef;
 class OpHistory {
-  set<pair<utime_t, const OpRequest *> > arrived;
-  set<pair<double, const OpRequest *> > duration;
+  set<pair<utime_t, OpRequestRef> > arrived;
+  set<pair<double, OpRequestRef> > duration;
   void cleanup(utime_t now);
 
 public:
-  void insert(utime_t now, OpRequest *op);
+  void insert(utime_t now, OpRequestRef op);
   void dump_ops(utime_t now, Formatter *f);
 };
 
-class OpRequest;
-typedef std::tr1::shared_ptr<OpRequest> OpRequestRef;
 class OpTracker {
   class RemoveOnDelete {
     OpTracker *tracker;