From 3eadfa087f3ff5338f87306fd384d1f4749b8005 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 19 Sep 2017 14:49:05 -0500 Subject: [PATCH] osd/PG: make some trivial events TrivialEvent Signed-off-by: Sage Weil --- src/osd/PG.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/osd/PG.h b/src/osd/PG.h index 2cf90d48b194a..05a74afdb9c4f 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1576,6 +1576,12 @@ public: TrivialEvent(RecoveryTooFull) TrivialEvent(CancelRecovery) + TrivialEvent(MakePrimary) + TrivialEvent(MakeStray) + TrivialEvent(NeedActingChange) + TrivialEvent(IsIncomplete) + TrivialEvent(IsDown) + TrivialEvent(AllReplicasRecovered) TrivialEvent(DoRecovery) TrivialEvent(LocalRecoveryReserved) @@ -1741,12 +1747,6 @@ public: } }; - struct MakePrimary : boost::statechart::event< MakePrimary > { - MakePrimary() : boost::statechart::event< MakePrimary >() {} - }; - struct MakeStray : boost::statechart::event< MakeStray > { - MakeStray() : boost::statechart::event< MakeStray >() {} - }; struct Primary; struct Stray; @@ -1762,17 +1762,8 @@ public: struct Peering; struct WaitActingChange; - struct NeedActingChange : boost::statechart::event< NeedActingChange > { - NeedActingChange() : boost::statechart::event< NeedActingChange >() {} - }; struct Incomplete; - struct IsIncomplete : boost::statechart::event< IsIncomplete > { - IsIncomplete() : boost::statechart::event< IsIncomplete >() {} - }; struct Down; - struct IsDown : boost::statechart::event< IsDown > { - IsDown() : boost::statechart::event< IsDown >() {} - }; struct Primary : boost::statechart::state< Primary, Started, Peering >, NamedState { explicit Primary(my_context ctx); -- 2.39.5