From 0797b538bab15d3cc280b76ae8fdf342daafbb09 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 5 Feb 2011 13:50:02 -0800 Subject: [PATCH] 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 --- src/cfuse.cc | 2 -- src/cmds.cc | 2 -- src/cmon.cc | 2 -- src/common/Clock.h | 14 +------------- src/config.cc | 1 - src/config.h | 3 --- src/cosd.cc | 2 -- src/csyn.cc | 2 -- src/fakefuse.cc | 2 -- src/fakesyn.cc | 2 -- src/libceph.cc | 1 - src/librados.cc | 4 ---- src/rgw/rgw_admin.cc | 2 -- 13 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/cfuse.cc b/src/cfuse.cc index bae8d39c26d62..e7de35ac4a6e0 100644 --- 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 7b0bb2564294c..67269177a80e5 100644 --- 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 6aea08a1c8574..2e575b30256ba 100644 --- 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 a9521b7013d6d..d72d6d1c0785d 100644 --- 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 793a57718636c..3a7bdcd1bad1b 100644 --- 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 46873b2b80602..cff8a927749ea 100644 --- 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 4508fd684b48f..27086b662e402 100644 --- 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 24053e04a118a..130fd7de5bea6 100644 --- 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 5551e2f620d56..bb005431832f2 100644 --- 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 aeb78fc55223b..ce5793fb8bee8 100644 --- 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 88f2777532d01..18533ad4fd2e7 100644 --- 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 bb8ca25fcb903..2eeb447123a4b 100644 --- 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 b88cd514581d5..a0d7f8f1a677d 100644 --- 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; -- 2.47.3