From e976c536073d5026389f2efef4e59b120baf48ba Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Mar 2010 14:51:05 -0800
Subject: [PATCH] timer: kill unused g_timer

---
 src/common/Timer.cc        |  4 ----
 src/common/Timer.h         | 13 +++++--------
 src/cosd.cc                |  1 -
 src/fakefuse.cc            |  2 +-
 src/fakesyn.cc             |  4 ++--
 src/mds/mdstypes.h         |  2 +-
 src/msg/FakeMessenger.cc   |  1 -
 src/msg/SimpleMessenger.cc |  4 ++--
 8 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index 4d84b2a3606d1..fe8223a9347e4 100644
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -31,10 +31,6 @@
 #include <sys/time.h>
 #include <math.h>
 
-// single global instance
-Timer      g_timer;
-
-
 
 /**** thread solution *****/
 
diff --git a/src/common/Timer.h b/src/common/Timer.h
index bd1543de29586..e3611321768d1 100644
--- a/src/common/Timer.h
+++ b/src/common/Timer.h
@@ -133,11 +133,11 @@ class Timer {
 
 
 /*
- * SafeTimer is a wrapper around the raw Timer (or rather, g_timer, it's global
- * instantiation) that protects event execution with an existing mutex.  It 
- * provides for, among other things, reliable event cancellation on class
- * destruction.  The caller just needs to cancel each event (or cancel_all()),
- * and then call join() to ensure any concurrently exectuting events (in other
+ * SafeTimer is a wrapper around the a Timer that protects event
+ * execution with an existing mutex.  It provides for, among other
+ * things, reliable event cancellation on class destruction.  The
+ * caller just needs to cancel each event (or cancel_all()), and then
+ * call join() to ensure any concurrently exectuting events (in other
  * threads) get flushed.
  */
 class SafeTimer : public Timer {
@@ -170,9 +170,6 @@ public:
 };
 
 
-// single global instance
-extern Timer g_timer;
-
 
 
 #endif
diff --git a/src/cosd.cc b/src/cosd.cc
index 9c01046fac3d1..9f9d995da2c77 100644
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -143,7 +143,6 @@ int main(int argc, const char **argv)
        << " " << ((g_conf.osd_journal && g_conf.osd_journal[0]) ? g_conf.osd_journal:"(no journal)")
        << std::endl;
 
-  g_timer.shutdown();
   messenger->register_entity(entity_name_t::OSD(whoami));
   if (!messenger)
     return 1;
diff --git a/src/fakefuse.cc b/src/fakefuse.cc
index 11272d6967c1c..b715af1aa9a8f 100644
--- a/src/fakefuse.cc
+++ b/src/fakefuse.cc
@@ -53,7 +53,7 @@ class C_Test2 : public Context {
 public:
   void finish(int r) {
     cout << "C_Test2->finish(" << r << ")" << std::endl;
-    g_timer.add_event_after(2, new C_Test);
+    //g_timer.add_event_after(2, new C_Test);
   }
 };
 
diff --git a/src/fakesyn.cc b/src/fakesyn.cc
index 8b6c0c85357fa..e575d86fc815c 100644
--- a/src/fakesyn.cc
+++ b/src/fakesyn.cc
@@ -82,8 +82,8 @@ int main(int argc, const char **argv)
   assert(nargs.empty());
 
 
-  if (g_conf.kill_after) 
-    g_timer.add_event_after(g_conf.kill_after, new C_Die);
+  //if (g_conf.kill_after) 
+  //g_timer.add_event_after(g_conf.kill_after, new C_Die);
 
   if (g_conf.clock_tare) g_clock.tare();
 
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index aff034095d533..1152bd7369ba4 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -23,7 +23,7 @@ using namespace std;
 #define CEPH_FS_ONDISK_MAGIC "ceph fs volume v011"
 
 
-//#define MDS_REF_SET      // define me for improved debug output, sanity checking
+#define MDS_REF_SET      // define me for improved debug output, sanity checking
 //#define MDS_AUTHPIN_SET  // define me for debugging auth pin leaks
 //#define MDS_VERIFY_FRAGSTAT    // do do (slow) sanity checking on frags
 
diff --git a/src/msg/FakeMessenger.cc b/src/msg/FakeMessenger.cc
index df9248473ac19..2ee44e74c147d 100644
--- a/src/msg/FakeMessenger.cc
+++ b/src/msg/FakeMessenger.cc
@@ -126,7 +126,6 @@ int fakemessenger_do_loop()
   fakemessenger_do_loop_2();
   lock.Unlock();
 
-  g_timer.shutdown();
   return 0;
 }
 
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 4613ecb899810..60c972847ecc5 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2181,8 +2181,8 @@ int SimpleMessenger::start(bool nodaemon)
   }
 
   // some debug hackery?
-  if (g_conf.kill_after) 
-    g_timer.add_event_after(g_conf.kill_after, new C_Die);
+  //if (g_conf.kill_after) 
+  //qg_timer.add_event_after(g_conf.kill_after, new C_Die);
 
   // go!
   if (did_bind)
-- 
2.39.5