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

Use FairMQProgOptions for Sink and BenchmarkSampler

Browse Source
This commit is contained in:
Alexey Rybalchenko
2015-06-15 16:50:03 +02:00
parent 7fda980710
commit a3d919b763
14 changed files with 432 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
fairmq/FairMQStateMachine.cxx
View File

@@ -48,14 +48,14 @@ bool FairMQStateMachine::ChangeState(int event)
case INIT_DEVICE:
process_event(FairMQFSM::INIT_DEVICE());
return true;
case DEVICE_READY:
process_event(FairMQFSM::DEVICE_READY());
case internal_DEVICE_READY:
process_event(FairMQFSM::internal_DEVICE_READY());
return true;
case INIT_TASK:
process_event(FairMQFSM::INIT_TASK());
return true;
case READY:
process_event(FairMQFSM::READY());
case internal_READY:
process_event(FairMQFSM::internal_READY());
return true;
case RUN:
process_event(FairMQFSM::RUN());
@@ -75,8 +75,8 @@ bool FairMQStateMachine::ChangeState(int event)
case RESET_TASK:
process_event(FairMQFSM::RESET_TASK());
return true;
case IDLE:
process_event(FairMQFSM::IDLE());
case internal_IDLE:
process_event(FairMQFSM::internal_IDLE());
return true;
case END:
process_event(FairMQFSM::END());
@@ -99,18 +99,10 @@ bool FairMQStateMachine::ChangeState(std::string event)
{
return ChangeState(INIT_DEVICE);
}
if (event == "DEVICE_READY")
{
return ChangeState(DEVICE_READY);
}
if (event == "INIT_TASK")
{
return ChangeState(INIT_TASK);
}
if (event == "READY")
{
return ChangeState(READY);
}
else if (event == "RUN")
{
return ChangeState(RUN);
@@ -135,10 +127,6 @@ bool FairMQStateMachine::ChangeState(std::string event)
{
return ChangeState(RESET_TASK);
}
else if (event == "IDLE")
{
return ChangeState(IDLE);
}
else if (event == "END")
{
return ChangeState(END);
@@ -212,18 +200,10 @@ void FairMQStateMachine::WaitForEndOfState(std::string event)
{
return WaitForEndOfState(INIT_DEVICE);
}
if (event == "DEVICE_READY")
{
return WaitForEndOfState(DEVICE_READY);
}
if (event == "INIT_TASK")
{
return WaitForEndOfState(INIT_TASK);
}
if (event == "READY")
{
return WaitForEndOfState(READY);
}
else if (event == "RUN")
{
return WaitForEndOfState(RUN);
@@ -248,10 +228,6 @@ void FairMQStateMachine::WaitForEndOfState(std::string event)
{
return WaitForEndOfState(RESET_TASK);
}
else if (event == "IDLE")
{
return WaitForEndOfState(IDLE);
}
else if (event == "END")
{
return WaitForEndOfState(END);