From 8069e83c0fabd990909fe3dd4249dbad01b80765 Mon Sep 17 00:00:00 2001
From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Wed, 15 Jun 2011 15:01:50 -0700
Subject: [PATCH] common/DecayCounter: deglobalize

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---
 src/common/DecayCounter.h | 15 ++++++---------
 src/mds/mdstypes.h        | 17 +++++++++++++----
 src/osd/OSD.cc            |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/common/DecayCounter.h b/src/common/DecayCounter.h
index 9c32df4654a11..37769bec69476 100644
--- a/src/common/DecayCounter.h
+++ b/src/common/DecayCounter.h
@@ -15,10 +15,9 @@
 #ifndef CEPH_DECAYCOUNTER_H
 #define CEPH_DECAYCOUNTER_H
 
-#include <math.h>
-#include "Clock.h"
+#include "include/utime.h"
 
-#include "common/config.h"
+#include <math.h>
 
 /**
  *
@@ -75,8 +74,9 @@ public:
     ::decode(vel, p);
   }
 
-  DecayCounter() : val(0), delta(0), vel(0) {
-    reset();
+  DecayCounter(const utime_t &now)
+    : val(0), delta(0), vel(0), last_decay(now)
+  {
   }
 
   /**
@@ -127,11 +127,8 @@ public:
    * decay etc.
    */
 
-  void reset() {
-    reset(ceph_clock_now(&g_ceph_context));
-  }
   void reset(utime_t now) {
-    last_decay = ceph_clock_now(&g_ceph_context);
+    last_decay = now;
     val = delta = 0;
   }
   
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 81026160888ca..b1cb340b2b8ab 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -15,6 +15,7 @@
 using namespace std;
 
 #include "common/config.h"
+#include "common/Clock.h"
 #include "common/DecayCounter.h"
 #include "include/Context.h"
 
@@ -931,8 +932,12 @@ namespace __gnu_cxx {
 
 class inode_load_vec_t {
   static const int NUM = 2;
-  DecayCounter vec[NUM];
+  std::vector < DecayCounter > vec;
 public:
+  inode_load_vec_t()
+     : vec(NUM, DecayCounter(ceph_clock_now(&g_ceph_context)))
+  {
+  }
   DecayCounter &get(int t) { 
     assert(t < NUM);
     return vec[t]; 
@@ -959,8 +964,11 @@ WRITE_CLASS_ENCODER(inode_load_vec_t)
 class dirfrag_load_vec_t {
 public:
   static const int NUM = 5;
-  DecayCounter vec[NUM];
-
+  std::vector < DecayCounter > vec;
+  dirfrag_load_vec_t()
+     : vec(NUM, DecayCounter(ceph_clock_now(&g_ceph_context)))
+  {
+  }
   void encode(bufferlist &bl) const {
     __u8 struct_v = 1;
     ::encode(struct_v, bl);
@@ -1115,7 +1123,8 @@ public:
   DecayCounter count;
 
 public:
-  load_spread_t() : p(0), n(0) { 
+  load_spread_t() : p(0), n(0), count(ceph_clock_now(&g_ceph_context))
+  {
     for (int i=0; i<MAX; i++)
       last[i] = -1;
   } 
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b1c4c8fb63de6..d7e4c7a3da36a 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -427,7 +427,7 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger,
   heartbeat_thread(this),
   heartbeat_dispatcher(this),
   decayrate(5.0),
-  stat_oprate(),
+  stat_oprate(ceph_clock_now(&g_ceph_context)),
   peer_stat_lock("OSD::peer_stat_lock"),
   read_latency_calc(g_conf->osd_max_opq<1 ? 1:g_conf->osd_max_opq),
   qlen_calc(3),
-- 
2.39.5