From 3321f10097255a89c5b7f6a4f1232ba694e83450 Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Sat, 24 Sep 2016 20:37:49 +0100 Subject: [PATCH] mds/MDSDaemon: move C_MDS_Tick class to .cc file Signed-off-by: Michal Jarzabek --- src/mds/MDSDaemon.cc | 13 +++++++++++++ src/mds/MDSDaemon.h | 14 ++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index 59c631e05481b..c85769e4caa84 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -91,6 +91,19 @@ class C_VoidFn : public Context } }; +class MDSDaemon::C_MDS_Tick : public Context { + protected: + MDSDaemon *mds_daemon; +public: + explicit C_MDS_Tick(MDSDaemon *m) : mds_daemon(m) {} + void finish(int r) { + assert(mds_daemon->mds_lock.is_locked_by_me()); + + mds_daemon->tick_event = 0; + mds_daemon->tick(); + } +}; + // cons/des MDSDaemon::MDSDaemon(const std::string &n, Messenger *m, MonClient *mc) : Dispatcher(m->cct), diff --git a/src/mds/MDSDaemon.h b/src/mds/MDSDaemon.h index 701f56f965c8f..c940ec682fac8 100644 --- a/src/mds/MDSDaemon.h +++ b/src/mds/MDSDaemon.h @@ -112,18 +112,8 @@ class MDSDaemon : public Dispatcher, public md_config_obs_t { const std::set &changed); protected: // tick and other timer fun - class C_MDS_Tick : public Context { - protected: - MDSDaemon *mds_daemon; - public: - explicit C_MDS_Tick(MDSDaemon *m) : mds_daemon(m) {} - void finish(int r) { - assert(mds_daemon->mds_lock.is_locked_by_me()); - - mds_daemon->tick_event = 0; - mds_daemon->tick(); - } - } *tick_event; + class C_MDS_Tick; + C_MDS_Tick *tick_event; void reset_tick(); void wait_for_omap_osds(); -- 2.39.5