Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Alexey Rybalchenko 2019-07-16 12:52:09 +02:00 committed by Dennis Klein
parent 63c02657c1
commit 857ef0c9d3
2 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
fairmq/PluginServices.cxx
View File

@ -11,7 +11,7 @@
using namespace fair::mq; using namespace fair::mq;
using namespace std; using namespace std;
const std::unordered_map<std::string, PluginServices::DeviceState> PluginServices::fkDeviceStateStrMap = { const unordered_map<string, PluginServices::DeviceState> PluginServices::fkDeviceStateStrMap = {
{"OK", DeviceState::Ok}, {"OK", DeviceState::Ok},
{"ERROR", DeviceState::Error}, {"ERROR", DeviceState::Error},
{"IDLE", DeviceState::Idle}, {"IDLE", DeviceState::Idle},
@ -28,7 +28,7 @@ const std::unordered_map<std::string, PluginServices::DeviceState> PluginService
{"RESETTING DEVICE", DeviceState::ResettingDevice}, {"RESETTING DEVICE", DeviceState::ResettingDevice},
{"EXITING", DeviceState::Exiting} {"EXITING", DeviceState::Exiting}
}; };
const std::unordered_map<PluginServices::DeviceState, std::string, tools::HashEnum<PluginServices::DeviceState>> PluginServices::fkStrDeviceStateMap = { const unordered_map<PluginServices::DeviceState, string, tools::HashEnum<PluginServices::DeviceState>> PluginServices::fkStrDeviceStateMap = {
{DeviceState::Ok, "OK"}, {DeviceState::Ok, "OK"},
{DeviceState::Error, "ERROR"}, {DeviceState::Error, "ERROR"},
{DeviceState::Idle, "IDLE"}, {DeviceState::Idle, "IDLE"},
@ -45,7 +45,7 @@ const std::unordered_map<PluginServices::DeviceState, std::string, tools::HashEn
{DeviceState::ResettingDevice, "RESETTING DEVICE"}, {DeviceState::ResettingDevice, "RESETTING DEVICE"},
{DeviceState::Exiting, "EXITING"} {DeviceState::Exiting, "EXITING"}
}; };
const std::unordered_map<std::string, PluginServices::DeviceStateTransition> PluginServices::fkDeviceStateTransitionStrMap = { const unordered_map<string, PluginServices::DeviceStateTransition> PluginServices::fkDeviceStateTransitionStrMap = {
{"AUTO", DeviceStateTransition::Auto}, {"AUTO", DeviceStateTransition::Auto},
{"INIT DEVICE", DeviceStateTransition::InitDevice}, {"INIT DEVICE", DeviceStateTransition::InitDevice},
{"COMPLETE INIT", DeviceStateTransition::CompleteInit}, {"COMPLETE INIT", DeviceStateTransition::CompleteInit},
@ -59,7 +59,7 @@ const std::unordered_map<std::string, PluginServices::DeviceStateTransition> Plu
{"END", DeviceStateTransition::End}, {"END", DeviceStateTransition::End},
{"ERROR FOUND", DeviceStateTransition::ErrorFound}, {"ERROR FOUND", DeviceStateTransition::ErrorFound},
}; };
const std::unordered_map<PluginServices::DeviceStateTransition, std::string, tools::HashEnum<PluginServices::DeviceStateTransition>> PluginServices::fkStrDeviceStateTransitionMap = { const unordered_map<PluginServices::DeviceStateTransition, string, tools::HashEnum<PluginServices::DeviceStateTransition>> PluginServices::fkStrDeviceStateTransitionMap = {
{DeviceStateTransition::Auto, "Auto"}, {DeviceStateTransition::Auto, "Auto"},
{DeviceStateTransition::InitDevice, "INIT DEVICE"}, {DeviceStateTransition::InitDevice, "INIT DEVICE"},
{DeviceStateTransition::CompleteInit, "COMPLETE INIT"}, {DeviceStateTransition::CompleteInit, "COMPLETE INIT"},
@ -73,39 +73,39 @@ const std::unordered_map<PluginServices::DeviceStateTransition, std::string, too
{DeviceStateTransition::End, "END"}, {DeviceStateTransition::End, "END"},
{DeviceStateTransition::ErrorFound, "ERROR FOUND"}, {DeviceStateTransition::ErrorFound, "ERROR FOUND"},
}; };
const std::unordered_map<fair::mq::State, PluginServices::DeviceState, fair::mq::tools::HashEnum<fair::mq::State>> PluginServices::fkDeviceStateMap = { const unordered_map<State, PluginServices::DeviceState, tools::HashEnum<State>> PluginServices::fkDeviceStateMap = {
{fair::mq::State::Ok, DeviceState::Ok}, {State::Ok, DeviceState::Ok},
{fair::mq::State::Error, DeviceState::Error}, {State::Error, DeviceState::Error},
{fair::mq::State::Idle, DeviceState::Idle}, {State::Idle, DeviceState::Idle},
{fair::mq::State::InitializingDevice, DeviceState::InitializingDevice}, {State::InitializingDevice, DeviceState::InitializingDevice},
{fair::mq::State::Initialized, DeviceState::Initialized}, {State::Initialized, DeviceState::Initialized},
{fair::mq::State::Binding, DeviceState::Binding}, {State::Binding, DeviceState::Binding},
{fair::mq::State::Bound, DeviceState::Bound}, {State::Bound, DeviceState::Bound},
{fair::mq::State::Connecting, DeviceState::Connecting}, {State::Connecting, DeviceState::Connecting},
{fair::mq::State::DeviceReady, DeviceState::DeviceReady}, {State::DeviceReady, DeviceState::DeviceReady},
{fair::mq::State::InitializingTask, DeviceState::InitializingTask}, {State::InitializingTask, DeviceState::InitializingTask},
{fair::mq::State::Ready, DeviceState::Ready}, {State::Ready, DeviceState::Ready},
{fair::mq::State::Running, DeviceState::Running}, {State::Running, DeviceState::Running},
{fair::mq::State::ResettingTask, DeviceState::ResettingTask}, {State::ResettingTask, DeviceState::ResettingTask},
{fair::mq::State::ResettingDevice, DeviceState::ResettingDevice}, {State::ResettingDevice, DeviceState::ResettingDevice},
{fair::mq::State::Exiting, DeviceState::Exiting} {State::Exiting, DeviceState::Exiting}
}; };
const std::unordered_map<PluginServices::DeviceStateTransition, fair::mq::Transition, tools::HashEnum<PluginServices::DeviceStateTransition>> PluginServices::fkDeviceStateTransitionMap = { const unordered_map<PluginServices::DeviceStateTransition, Transition, tools::HashEnum<PluginServices::DeviceStateTransition>> PluginServices::fkDeviceStateTransitionMap = {
{DeviceStateTransition::Auto, fair::mq::Transition::Auto}, {DeviceStateTransition::Auto, Transition::Auto},
{DeviceStateTransition::InitDevice, fair::mq::Transition::InitDevice}, {DeviceStateTransition::InitDevice, Transition::InitDevice},
{DeviceStateTransition::CompleteInit, fair::mq::Transition::CompleteInit}, {DeviceStateTransition::CompleteInit, Transition::CompleteInit},
{DeviceStateTransition::Bind, fair::mq::Transition::Bind}, {DeviceStateTransition::Bind, Transition::Bind},
{DeviceStateTransition::Connect, fair::mq::Transition::Connect}, {DeviceStateTransition::Connect, Transition::Connect},
{DeviceStateTransition::InitTask, fair::mq::Transition::InitTask}, {DeviceStateTransition::InitTask, Transition::InitTask},
{DeviceStateTransition::Run, fair::mq::Transition::Run}, {DeviceStateTransition::Run, Transition::Run},
{DeviceStateTransition::Stop, fair::mq::Transition::Stop}, {DeviceStateTransition::Stop, Transition::Stop},
{DeviceStateTransition::ResetTask, fair::mq::Transition::ResetTask}, {DeviceStateTransition::ResetTask, Transition::ResetTask},
{DeviceStateTransition::ResetDevice, fair::mq::Transition::ResetDevice}, {DeviceStateTransition::ResetDevice, Transition::ResetDevice},
{DeviceStateTransition::End, fair::mq::Transition::End}, {DeviceStateTransition::End, Transition::End},
{DeviceStateTransition::ErrorFound, fair::mq::Transition::ErrorFound} {DeviceStateTransition::ErrorFound, Transition::ErrorFound}
}; };
auto PluginServices::ChangeDeviceState(const std::string& controller, const DeviceStateTransition next) -> bool auto PluginServices::ChangeDeviceState(const string& controller, const DeviceStateTransition next) -> bool
{ {
lock_guard<mutex> lock{fDeviceControllerMutex}; lock_guard<mutex> lock{fDeviceControllerMutex};
@ -125,7 +125,7 @@ auto PluginServices::ChangeDeviceState(const std::string& controller, const Devi
return result; return result;
} }
auto PluginServices::TakeDeviceControl(const std::string& controller) -> void auto PluginServices::TakeDeviceControl(const string& controller) -> void
{ {
lock_guard<mutex> lock{fDeviceControllerMutex}; lock_guard<mutex> lock{fDeviceControllerMutex};
@ -141,14 +141,14 @@ auto PluginServices::TakeDeviceControl(const std::string& controller) -> void
} }
} }
auto PluginServices::StealDeviceControl(const std::string& controller) -> void auto PluginServices::StealDeviceControl(const string& controller) -> void
{ {
lock_guard<mutex> lock{fDeviceControllerMutex}; lock_guard<mutex> lock{fDeviceControllerMutex};
fDeviceController = controller; fDeviceController = controller;
} }
auto PluginServices::ReleaseDeviceControl(const std::string& controller) -> void auto PluginServices::ReleaseDeviceControl(const string& controller) -> void
{ {
{ {
lock_guard<mutex> lock{fDeviceControllerMutex}; lock_guard<mutex> lock{fDeviceControllerMutex};
@ -163,7 +163,7 @@ auto PluginServices::ReleaseDeviceControl(const std::string& controller) -> void
fReleaseDeviceControlCondition.notify_one(); fReleaseDeviceControlCondition.notify_one();
} }
auto PluginServices::GetDeviceController() const -> boost::optional<std::string> auto PluginServices::GetDeviceController() const -> boost::optional<string>
{ {
lock_guard<mutex> lock{fDeviceControllerMutex}; lock_guard<mutex> lock{fDeviceControllerMutex};

11
fairmq/StateMachine.cxx
View File

@ -36,17 +36,6 @@ using namespace boost::msm::front;
using namespace boost::msm::back; using namespace boost::msm::back;
namespace bmpl = boost::mpl; namespace bmpl = boost::mpl;
namespace std
{
template<>
struct hash<fair::mq::Transition> : fair::mq::tools::HashEnum<fair::mq::Transition> {};
template<>
struct hash<fair::mq::State> : fair::mq::tools::HashEnum<fair::mq::State> {};
} /* namespace std */
namespace fair namespace fair
{ {
namespace mq namespace mq