From 74881d27e30e49dc987a90de240c6be5ca9d843c Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 12 Mar 2019 11:14:24 +0100 Subject: [PATCH] Remove obsolete state machine code --- fairmq/StateMachine.cxx | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/fairmq/StateMachine.cxx b/fairmq/StateMachine.cxx index 850d0547..c9c4a4e6 100644 --- a/fairmq/StateMachine.cxx +++ b/fairmq/StateMachine.cxx @@ -168,7 +168,6 @@ struct Machine_ : public state_machine_def Machine_() : fLastTransitionResult(true) , fNewStatePending(false) - , fWorkOngoing(false) {} virtual ~Machine_() {} @@ -259,9 +258,7 @@ struct Machine_ : public state_machine_def mutex fStateMtx; atomic fNewStatePending; - atomic fWorkOngoing; condition_variable fNewStatePendingCV; - condition_variable fWorkDoneCV; boost::signals2::signal fStateChangeSignal; boost::signals2::signal fStateHandleSignal; @@ -284,7 +281,6 @@ struct Machine_ : public state_machine_def LOG(state) << fState << " ---> " << fNewState; fState = static_cast(fNewState); fNewStatePending = false; - fWorkOngoing = true; if (fState == State::Exiting || fState == State::Error) { stop = true; @@ -293,12 +289,6 @@ struct Machine_ : public state_machine_def CallStateChangeCallbacks(fState); CallStateHandler(fState); - - { - lock_guard lock(fStateMtx); - fWorkOngoing = false; - fWorkDoneCV.notify_one(); - } } if (fState == State::Error) { @@ -477,8 +467,6 @@ void StateMachine::ProcessWork() lock_guard lock(fsm->fStateMtx); fsm->fState = State::Error; fsm->CallStateChangeCallbacks(State::Error); - fsm->fWorkOngoing = false; - fsm->fWorkDoneCV.notify_one(); } ChangeState(Transition::ErrorFound); throw;