From: Samuel Just <sam.just@inktank.com>
Date: Mon, 18 Mar 2013 23:17:29 +0000 (-0700)
Subject: OSD: rename timer to tick_timer
X-Git-Tag: v0.62~191^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e41554da14887ef44db5adcc21e52095958d4e75;p=ceph.git

OSD: rename timer to tick_timer

Only used for scheduling ticks - we should keep it
that way.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5d362c4ce603..a08263e2e6cf 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -758,7 +758,7 @@ OSD::OSD(int id, Messenger *internal_messenger, Messenger *external_messenger,
 	 const std::string &dev, const std::string &jdev) :
   Dispatcher(external_messenger->cct),
   osd_lock("OSD::osd_lock"),
-  timer(external_messenger->cct, osd_lock),
+  tick_timer(external_messenger->cct, osd_lock),
   authorize_handler_cluster_registry(new AuthAuthorizeHandlerRegistry(external_messenger->cct,
 								      cct->_conf->auth_supported.length() ?
 								      cct->_conf->auth_supported :
@@ -912,7 +912,7 @@ int OSD::init()
 {
   Mutex::Locker lock(osd_lock);
 
-  timer.init();
+  tick_timer.init();
   service.backfill_request_timer.init();
 
   // mount.
@@ -1020,7 +1020,7 @@ int OSD::init()
   heartbeat_thread.create();
 
   // tick
-  timer.add_event_after(g_conf->osd_heartbeat_interval, new C_Tick(this));
+  tick_timer.add_event_after(g_conf->osd_heartbeat_interval, new C_Tick(this));
 
   AdminSocket *admin_socket = cct->get_admin_socket();
   asok_hook = new OSDSocketHook(this);
@@ -1185,7 +1185,7 @@ int OSD::shutdown()
 
   state = STATE_STOPPING;
 
-  timer.shutdown();
+  tick_timer.shutdown();
 
   heartbeat_lock.Lock();
   heartbeat_stop = true;
@@ -2459,7 +2459,7 @@ void OSD::tick()
 
   check_ops_in_flight();
 
-  timer.add_event_after(1.0, new C_Tick(this));
+  tick_timer.add_event_after(1.0, new C_Tick(this));
 }
 
 void OSD::check_ops_in_flight()
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 1ce80e1414e1..6a6aa54ce1d1 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -419,7 +419,7 @@ public:
 
 protected:
   Mutex osd_lock;			// global lock
-  SafeTimer timer;    // safe timer (osd_lock)
+  SafeTimer tick_timer;    // safe timer (osd_lock)
 
   AuthAuthorizeHandlerRegistry *authorize_handler_cluster_registry;
   AuthAuthorizeHandlerRegistry *authorize_handler_service_registry;