Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 17:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add backwards compatibility for removed ChangeState(int)

Browse Source
This commit is contained in:
Alexey Rybalchenko
2019-02-26 13:10:51 +01:00
committed by Dennis Klein
parent 7dcd84dd93
commit d9edcad845
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fairmq/StateMachine.cxx
View File

@@ -201,20 +201,6 @@ struct Machine_ : public state_machine_def<Machine_>
}
};
struct ErrorFct
{
template<typename EVT, typename FSM, typename SourceState, typename TargetState>
void operator()(EVT const& e, FSM& fsm, SourceState& /* ss */, TargetState& ts)
{
fsm.fState = ts.Type();
fsm.fLastTransitionResult = true;
fsm.CallNewTransitionCallbacks(e.Type());
fsm.CallStateChangeCallbacks(ts.Type());
fsm.fNewStatePending = true;
fsm.fNewStatePendingCV.notify_all();
}
};
struct transition_table : bmpl::vector<
// Start Transition Next Action Guard
Row<IDLE_S, END_E, EXITING_S, DefaultFct, none>,
@@ -242,7 +228,7 @@ struct Machine_ : public state_machine_def<Machine_>
Row<RESETTING_TASK_S, AUTO_E, DEVICE_READY_S, DefaultFct, none>,
Row<RESETTING_DEVICE_S, AUTO_E, IDLE_S, DefaultFct, none>,
Row<OK_S, ERROR_FOUND_E, ERROR_S, ErrorFct, none>> {};
Row<OK_S, ERROR_FOUND_E, ERROR_S, DefaultFct, none>> {};
void CallStateChangeCallbacks(const State state) const
{
@@ -480,6 +466,8 @@ void StateMachine::ProcessWork()
} catch(...) {
{
lock_guard<mutex> lock(fsm->fStateMtx);
fsm->fState = State::Error;
fsm->CallStateChangeCallbacks(State::Error);
fsm->fWorkOngoing = false;
fsm->fWorkDoneCV.notify_one();
}