From 34fcf42c697d5fdfdf5fea9de81b3c6cb2556de9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 24 Jan 2014 14:18:49 -0800 Subject: [PATCH] osd/HitSet: add HitSetRef Signed-off-by: Sage Weil --- src/osd/HitSet.h | 2 ++ src/osd/ReplicatedPG.cc | 2 +- src/osd/ReplicatedPG.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h index b6acce9485058..391dd63ee8fa3 100644 --- a/src/osd/HitSet.h +++ b/src/osd/HitSet.h @@ -170,6 +170,8 @@ private: WRITE_CLASS_ENCODER(HitSet); WRITE_CLASS_ENCODER(HitSet::Params); +typedef boost::shared_ptr HitSetRef; + ostream& operator<<(ostream& out, const HitSet::Params& p); /** diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c40ea9a57eb26..8dcc54b1ca55a 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -9907,7 +9907,7 @@ hobject_t ReplicatedPG::get_hit_set_archive_object(utime_t start, utime_t end) void ReplicatedPG::hit_set_clear() { dout(20) << __func__ << dendl; - hit_set.reset(NULL); + hit_set.reset(); hit_set_start_stamp = utime_t(); } diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index f29362299422b..4f683a65a328e 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -664,7 +664,7 @@ protected: void simple_repop_submit(RepGather *repop); // hot/cold tracking - boost::scoped_ptr hit_set; ///< currently accumulating HitSet + HitSetRef hit_set; ///< currently accumulating HitSet utime_t hit_set_start_stamp; ///< time the current HitSet started recording void hit_set_clear(); ///< discard any HitSet state -- 2.39.5