clock: remove tare function

This was used way back when to set a clock's relative "zero" time to
simplify stat collection when running performance benchmarks.  It has no
use in a real system.  If we need relative time for something, we can
subtract off the zero time in the output.

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

diff --git a/src/cfuse.cc b/src/cfuse.cc
index bae8d39c26d6266c19cda30949c0d8b3106f7295..e7de35ac4a6e097ad263e41e7269ba260f2db6bd 100644 (file)
--- a/src/cfuse.cc
+++ b/src/cfuse.cc
@@ -73,8 +73,6 @@ int main(int argc, const char **argv, const char *envp[]) {
   // FUSE will chdir("/"); be ready.
   g_conf.chdir = strdup("/");
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   // check for 32-bit arch
   if (sizeof(long) == 4) {
     cerr << std::endl;

diff --git a/src/cmds.cc b/src/cmds.cc
index 7b0bb2564294c3f2861ee044f8437462581d0557..67269177a80e5f704a864d4191fc1cf5426ba4f0 100644 (file)
--- a/src/cmds.cc
+++ b/src/cmds.cc
@@ -118,8 +118,6 @@ int main(int argc, const char **argv)
     usage();
   }
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   // get monmap
   RotatingKeyRing rkeys(CEPH_ENTITY_TYPE_MDS, &g_keyring);
   MonClient mc(&rkeys);

diff --git a/src/cmon.cc b/src/cmon.cc
index 6aea08a1c85744e958e1208779c25fd2642a7403..2e575b30256baa965e29f4ac9758ea14e5a7cb35 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -120,8 +120,6 @@ int main(int argc, const char **argv)
     return 0;
   }
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   CompatSet mon_features(ceph_mon_feature_compat,
                         ceph_mon_feature_ro_compat,
                         ceph_mon_feature_incompat);

diff --git a/src/common/Clock.h b/src/common/Clock.h
index a9521b7013d6dd6b0ceb1fd519083aa3a97256b5..d72d6d1c0785dc4474dd59fdd7074c16b0cd3794 100644 (file)
--- a/src/common/Clock.h
+++ b/src/common/Clock.h
@@ -40,10 +40,7 @@ class Clock {
   Mutex lock;
 
  public:
-  Clock() : lock("Clock::lock") {
-    // set offset
-    //tare();
-  }
+  Clock() : lock("Clock::lock") { }
 
   // real time.
   utime_t real_now() {
@@ -53,15 +50,6 @@ class Clock {
     return realnow;
   }
 
-  // relative time (from startup)
-  void tare() {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    zero.set_from_timeval(&tv);
-  }
-  void tare(utime_t z) {
-    zero = z;
-  }
   utime_t now() {
     //lock.Lock();  
     struct timeval tv;

diff --git a/src/config.cc b/src/config.cc
index 793a57718636cb4bf6c29adb71b7e2a0cf71fb34..3a7bdcd1bad1b089e0c47099791e91383ecadd2c 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -290,7 +290,6 @@ static struct config_option config_optionsp[] = {
        OPTION(key, 0, OPT_STR, ""),
        OPTION(keyfile, 'K', OPT_STR, ""),
        OPTION(keyring, 'k', OPT_STR, "/etc/ceph/keyring,/etc/ceph/keyring.bin"),
-       OPTION(clock_tare, 0, OPT_BOOL, false),
        OPTION(ms_tcp_nodelay, 0, OPT_BOOL, true),
        OPTION(ms_initial_backoff, 0, OPT_DOUBLE, .2),
        OPTION(ms_max_backoff, 0, OPT_DOUBLE, 15.0),

diff --git a/src/config.h b/src/config.h
index 46873b2b80602307913db212aeb248ef41c716fc..cff8a927749ea8549e6643dd872a64678ff85c29 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -135,9 +135,6 @@ struct md_config_t {
   int debug_auth;
   int debug_finisher;
 
-  // clock
-  bool clock_tare;
-
   // auth
   char *key;
   char *keyfile;

diff --git a/src/cosd.cc b/src/cosd.cc
index 4508fd684b48f0e5d63767fc1043f05e4a9e8ece..27086b662e40209d6e94e6a1ec87349963cbd0f3 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -71,8 +71,6 @@ int main(int argc, const char **argv)
 #endif //HAVE_LIBTCMALLOC
   common_init(args, "osd", should_authenticate);
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   // osd specific args
   bool mkfs = false;
   bool mkjournal = false;

diff --git a/src/csyn.cc b/src/csyn.cc
index 24053e04a118ac0214418d4ceb03c57e3a2ca373..130fd7de5bea68d734ac005d7a1d1aca57bc305e 100644 (file)
--- a/src/csyn.cc
+++ b/src/csyn.cc
@@ -53,8 +53,6 @@ int main(int argc, const char **argv, char *envp[])
 
   vec_to_argv(args, argc, argv);
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   // get monmap
   MonClient mc;
   if (mc.build_initial_monmap() < 0)

diff --git a/src/fakefuse.cc b/src/fakefuse.cc
index 5551e2f620d56d40fb2ec006102c34484011d502..bb005431832f23784b037f903c7d5a4f5dc4f4bf 100644 (file)
--- a/src/fakefuse.cc
+++ b/src/fakefuse.cc
@@ -90,8 +90,6 @@ int main(int argc, const char **argv) {
   // FUSE will chdir("/"); be ready.
   g_conf.use_abspaths = true;
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   MonMap *monmap = new MonMap(g_conf.num_mon);
   entity_addr_t a;
   a.nonce = getpid();

diff --git a/src/fakesyn.cc b/src/fakesyn.cc
index aeb78fc55223ba050404056f5f17221b493ab16f..ce5793fb8bee83d7c76adb33e5a476cf655464c2 100644 (file)
--- a/src/fakesyn.cc
+++ b/src/fakesyn.cc
@@ -87,8 +87,6 @@ int main(int argc, const char **argv)
   //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();
-
 
   MonMap *monmap = new MonMap(g_conf.num_mon);
   entity_addr_t a;

diff --git a/src/libceph.cc b/src/libceph.cc
index 88f2777532d01993f0d32c25c43e1fa668607ef5..18533ad4fd2e75048aa652b5fea7fc111bc8f19d 100644 (file)
--- a/src/libceph.cc
+++ b/src/libceph.cc
@@ -44,7 +44,6 @@ extern "C" int ceph_initialize(int argc, const char **argv)
     argv_to_vec(argc, argv, args);
     common_set_defaults(false);
     common_init(args, "libceph", true);
-    if (g_conf.clock_tare) g_clock.tare();
     //monmap
     monclient = new MonClient();
     if (monclient->build_initial_monmap() < 0) {

diff --git a/src/librados.cc b/src/librados.cc
index bb8ca25fcb9039425d3d80374dae5f6e17cc5943..2eeb447123a4b2a4b00cc6e900a64e0d14231018 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -1751,8 +1751,6 @@ int Rados::initialize(int argc, const char *argv[])
   common_set_defaults(false);
   common_init(args, "librados", true);
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   client = new RadosClient();
   return client->init();
 }
@@ -2275,8 +2273,6 @@ static void __rados_init(int argc, const char *argv[])
   }
   common_set_defaults(false);
   common_init(args, "librados", true);
-
-  if (g_conf.clock_tare) g_clock.tare();
 }
 
 static Mutex rados_init_mutex("rados_init");

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index b88cd514581d592acb9a1e7f04f4544335ddfd96..a0d7f8f1a677d6084f34bac8c36eb0a99ed4db87 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -102,8 +102,6 @@ int main(int argc, char **argv)
   RGWUserInfo info;
   RGWAccess *store;
 
-  if (g_conf.clock_tare) g_clock.tare();
-
   FOR_EACH_ARG(args) {
     if (CONF_ARG_EQ("user-gen", 'g')) {
       gen_user = true;