From: Michal Jarzabek Date: Fri, 23 Sep 2016 18:43:56 +0000 (+0100) Subject: mon/Paxos: move classes to .cc file X-Git-Tag: v10.2.10~112^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1869ed9b2d4225e2bf0f366baf75e0e14f202aea;p=ceph.git mon/Paxos: move classes to .cc file Signed-off-by: Michal Jarzabek (cherry picked from commit d21357a7e042424754d9ab41c134cae9e89945f9) --- diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 5835579995c..c71689e8c4b 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -38,6 +38,70 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon, const string& name, << ") "; } +class Paxos::C_CollectTimeout : public Context { + Paxos *paxos; +public: + explicit C_CollectTimeout(Paxos *p) : paxos(p) {} + void finish(int r) { + if (r == -ECANCELED) + return; + paxos->collect_timeout(); + } +}; + +class Paxos::C_AcceptTimeout : public Context { + Paxos *paxos; +public: + explicit C_AcceptTimeout(Paxos *p) : paxos(p) {} + void finish(int r) { + if (r == -ECANCELED) + return; + paxos->accept_timeout(); + } +}; + +class Paxos::C_LeaseAckTimeout : public Context { + Paxos *paxos; +public: + explicit C_LeaseAckTimeout(Paxos *p) : paxos(p) {} + void finish(int r) { + if (r == -ECANCELED) + return; + paxos->lease_ack_timeout(); + } +}; + +class Paxos::C_LeaseTimeout : public Context { + Paxos *paxos; +public: + explicit C_LeaseTimeout(Paxos *p) : paxos(p) {} + void finish(int r) { + if (r == -ECANCELED) + return; + paxos->lease_timeout(); + } +}; + +class Paxos::C_LeaseRenew : public Context { + Paxos *paxos; +public: + explicit C_LeaseRenew(Paxos *p) : paxos(p) {} + void finish(int r) { + if (r == -ECANCELED) + return; + paxos->lease_renew_timeout(); + } +}; + +class Paxos::C_Trimmed : public Context { + Paxos *paxos; +public: + explicit C_Trimmed(Paxos *p) : paxos(p) { } + void finish(int r) { + paxos->trimming = false; + } +}; + MonitorDBStore *Paxos::get_store() { return mon->store; diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index 3f2a6337c19..a8884bd18f5 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -626,81 +626,27 @@ private: /** * Callback class responsible for handling a Collect Timeout. */ - class C_CollectTimeout : public Context { - Paxos *paxos; - public: - explicit C_CollectTimeout(Paxos *p) : paxos(p) {} - void finish(int r) { - if (r == -ECANCELED) - return; - paxos->collect_timeout(); - } - }; - + class C_CollectTimeout; /** * Callback class responsible for handling an Accept Timeout. */ - class C_AcceptTimeout : public Context { - Paxos *paxos; - public: - explicit C_AcceptTimeout(Paxos *p) : paxos(p) {} - void finish(int r) { - if (r == -ECANCELED) - return; - paxos->accept_timeout(); - } - }; - + class C_AcceptTimeout; /** * Callback class responsible for handling a Lease Ack Timeout. */ - class C_LeaseAckTimeout : public Context { - Paxos *paxos; - public: - explicit C_LeaseAckTimeout(Paxos *p) : paxos(p) {} - void finish(int r) { - if (r == -ECANCELED) - return; - paxos->lease_ack_timeout(); - } - }; + class C_LeaseAckTimeout; /** * Callback class responsible for handling a Lease Timeout. */ - class C_LeaseTimeout : public Context { - Paxos *paxos; - public: - explicit C_LeaseTimeout(Paxos *p) : paxos(p) {} - void finish(int r) { - if (r == -ECANCELED) - return; - paxos->lease_timeout(); - } - }; + class C_LeaseTimeout; /** * Callback class responsible for handling a Lease Renew Timeout. */ - class C_LeaseRenew : public Context { - Paxos *paxos; - public: - explicit C_LeaseRenew(Paxos *p) : paxos(p) {} - void finish(int r) { - if (r == -ECANCELED) - return; - paxos->lease_renew_timeout(); - } - }; + class C_LeaseRenew; - class C_Trimmed : public Context { - Paxos *paxos; - public: - explicit C_Trimmed(Paxos *p) : paxos(p) { } - void finish(int r) { - paxos->trimming = false; - } - }; + class C_Trimmed; /** * */