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

DDS plugin: refactor for better readability

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-03-24 15:05:29 +01:00
parent c7b1304a2c
commit 926ee743ed
2 changed files with 105 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
fairmq/plugins/DDS/DDS.cxx
View File

@ -8,8 +8,6 @@
#include "DDS.h" #include "DDS.h"
#include <fairmq/sdk/commands/Commands.h>
#include <fairmq/tools/Strings.h> #include <fairmq/tools/Strings.h>
#include <boost/algorithm/string/join.hpp> #include <boost/algorithm/string/join.hpp>
@ -315,28 +313,30 @@ auto DDS::SubscribeForCustomCommands() -> void
fDDS.SubscribeCustomCmd([id, this](const string& cmdStr, const string& cond, uint64_t senderId) { fDDS.SubscribeCustomCmd([id, this](const string& cmdStr, const string& cond, uint64_t senderId) {
// LOG(info) << "Received command: '" << cmdStr << "' from " << senderId; // LOG(info) << "Received command: '" << cmdStr << "' from " << senderId;
sdk::cmd::Cmds inCmds;
using namespace fair::mq::sdk;
cmd::Cmds inCmds;
inCmds.Deserialize(cmdStr); inCmds.Deserialize(cmdStr);
for (const auto& cmd : inCmds) { for (const auto& cmd : inCmds) {
// LOG(info) << "Received command type: '" << cmd->GetType() << "' from " << senderId; HandleCmd(id, *cmd, cond, senderId);
switch (cmd->GetType()) { }
case cmd::Type::check_state: { });
fDDS.Send(cmd::Cmds(cmd::make<cmd::CurrentState>(id, GetCurrentDeviceState())) }
.Serialize(),
to_string(senderId)); auto DDS::HandleCmd(const string& id, sdk::cmd::Cmd& cmd, const string& cond, uint64_t senderId) -> void
{
using namespace fair::mq::sdk;
using namespace fair::mq::sdk::cmd;
// LOG(info) << "Received command type: '" << cmd.GetType() << "' from " << senderId;
switch (cmd.GetType()) {
case Type::check_state: {
fDDS.Send(Cmds(make<CurrentState>(id, GetCurrentDeviceState())).Serialize(), to_string(senderId));
} break; } break;
case cmd::Type::change_state: { case Type::change_state: {
Transition transition = static_cast<cmd::ChangeState&>(*cmd).GetTransition(); Transition transition = static_cast<ChangeState&>(cmd).GetTransition();
if (ChangeDeviceState(transition)) { if (ChangeDeviceState(transition)) {
cmd::Cmds outCmds( Cmds outCmds(make<TransitionStatus>(id, fDDSTaskId, Result::Ok, transition));
cmd::make<cmd::TransitionStatus>(id, fDDSTaskId, cmd::Result::Ok, transition));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} else { } else {
sdk::cmd::Cmds outCmds( Cmds outCmds(make<TransitionStatus>(id, fDDSTaskId, Result::Failure, transition));
cmd::make<cmd::TransitionStatus>(id, fDDSTaskId, cmd::Result::Failure, transition));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} }
{ {
@ -344,15 +344,15 @@ auto DDS::SubscribeForCustomCommands() -> void
fLastExternalController = senderId; fLastExternalController = senderId;
} }
} break; } break;
case cmd::Type::dump_config: { case Type::dump_config: {
stringstream ss; stringstream ss;
for (const auto pKey : GetPropertyKeys()) { for (const auto pKey : GetPropertyKeys()) {
ss << id << ": " << pKey << " -> " << GetPropertyAsString(pKey) << "\n"; ss << id << ": " << pKey << " -> " << GetPropertyAsString(pKey) << "\n";
} }
cmd::Cmds outCmds(cmd::make<cmd::Config>(id, ss.str())); Cmds outCmds(make<Config>(id, ss.str()));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} break; } break;
case cmd::Type::state_change_exiting_received: { case Type::state_change_exiting_received: {
{ {
lock_guard<mutex> lock{fStateChangeSubscriberMutex}; lock_guard<mutex> lock{fStateChangeSubscriberMutex};
if (fLastExternalController == senderId) { if (fLastExternalController == senderId) {
@ -361,32 +361,29 @@ auto DDS::SubscribeForCustomCommands() -> void
} }
fExitingAcked.notify_one(); fExitingAcked.notify_one();
} break; } break;
case cmd::Type::subscribe_to_state_change: { case Type::subscribe_to_state_change: {
lock_guard<mutex> lock{fStateChangeSubscriberMutex}; lock_guard<mutex> lock{fStateChangeSubscriberMutex};
fStateChangeSubscribers.insert(senderId); fStateChangeSubscribers.insert(senderId);
LOG(debug) << "Publishing state-change: " << fLastState << "->" << fCurrentState LOG(debug) << "Publishing state-change: " << fLastState << "->" << fCurrentState << " to " << senderId;
<< " to " << senderId;
cmd::Cmds outCmds( Cmds outCmds(make<StateChangeSubscription>(id, Result::Ok),
cmd::make<cmd::StateChangeSubscription>(id, cmd::Result::Ok), make<StateChange>(id, fDDSTaskId, fLastState, fCurrentState));
cmd::make<cmd::StateChange>(id, fDDSTaskId, fLastState, fCurrentState));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} break; } break;
case cmd::Type::unsubscribe_from_state_change: { case Type::unsubscribe_from_state_change: {
{ {
lock_guard<mutex> lock{fStateChangeSubscriberMutex}; lock_guard<mutex> lock{fStateChangeSubscriberMutex};
fStateChangeSubscribers.erase(senderId); fStateChangeSubscribers.erase(senderId);
} }
cmd::Cmds outCmds( Cmds outCmds(make<StateChangeUnsubscription>(id, Result::Ok));
cmd::make<cmd::StateChangeUnsubscription>(id, cmd::Result::Ok));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} break; } break;
case cmd::Type::get_properties: { case Type::get_properties: {
auto _cmd = static_cast<cmd::GetProperties&>(*cmd); auto _cmd = static_cast<cmd::GetProperties&>(cmd);
auto const request_id(_cmd.GetRequestId()); auto const request_id(_cmd.GetRequestId());
auto result(cmd::Result::Ok); auto result(Result::Ok);
std::vector<std::pair<std::string, std::string>> props; std::vector<std::pair<std::string, std::string>> props;
try { try {
for (auto const& prop : GetPropertiesAsString(_cmd.GetQuery())) { for (auto const& prop : GetPropertiesAsString(_cmd.GetQuery())) {
@ -394,15 +391,15 @@ auto DDS::SubscribeForCustomCommands() -> void
} }
} catch (std::exception const& e) { } catch (std::exception const& e) {
LOG(warn) << "Getting properties (request id: " << request_id << ") failed: " << e.what(); LOG(warn) << "Getting properties (request id: " << request_id << ") failed: " << e.what();
result = cmd::Result::Failure; result = Result::Failure;
} }
cmd::Cmds const outCmds(cmd::make<cmd::Properties>(id, request_id, result, props)); Cmds const outCmds(make<cmd::Properties>(id, request_id, result, props));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} break; } break;
case cmd::Type::set_properties: { case Type::set_properties: {
auto _cmd(static_cast<cmd::SetProperties&>(*cmd)); auto _cmd(static_cast<cmd::SetProperties&>(cmd));
auto const request_id(_cmd.GetRequestId()); auto const request_id(_cmd.GetRequestId());
auto result(cmd::Result::Ok); auto result(Result::Ok);
try { try {
fair::mq::Properties props; fair::mq::Properties props;
for (auto const& prop : _cmd.GetProps()) { for (auto const& prop : _cmd.GetProps()) {
@ -412,20 +409,18 @@ auto DDS::SubscribeForCustomCommands() -> void
SetProperties(props); SetProperties(props);
} catch (std::exception const& e) { } catch (std::exception const& e) {
LOG(warn) << "Setting properties (request id: " << request_id << ") failed: " << e.what(); LOG(warn) << "Setting properties (request id: " << request_id << ") failed: " << e.what();
result = cmd::Result::Failure; result = Result::Failure;
} }
cmd::Cmds const outCmds(cmd::make<cmd::PropertiesSet>(id, request_id, result)); Cmds const outCmds(make<PropertiesSet>(id, request_id, result));
fDDS.Send(outCmds.Serialize(), to_string(senderId)); fDDS.Send(outCmds.Serialize(), to_string(senderId));
} break; } break;
default: default:
LOG(warn) << "Unexpected/unknown command received: " << cmdStr; LOG(warn) << "Unexpected/unknown command received: " << cmd.GetType();
LOG(warn) << "Origin: " << senderId; LOG(warn) << "Origin: " << senderId;
LOG(warn) << "Destination: " << cond; LOG(warn) << "Destination: " << cond;
break; break;
} }
} }
});
}
DDS::~DDS() DDS::~DDS()
{ {

2
fairmq/plugins/DDS/DDS.h
View File

@ -12,6 +12,7 @@
#include <fairmq/Plugin.h> #include <fairmq/Plugin.h>
#include <fairmq/StateQueue.h> #include <fairmq/StateQueue.h>
#include <fairmq/Version.h> #include <fairmq/Version.h>
#include <fairmq/sdk/commands/Commands.h>
#include <dds/dds.h> #include <dds/dds.h>
@ -142,6 +143,7 @@ class DDS : public Plugin
auto SubscribeForConnectingChannels() -> void; auto SubscribeForConnectingChannels() -> void;
auto PublishBoundChannels() -> void; auto PublishBoundChannels() -> void;
auto SubscribeForCustomCommands() -> void; auto SubscribeForCustomCommands() -> void;
auto HandleCmd(const std::string& id, sdk::cmd::Cmd& cmd, const std::string& cond, uint64_t senderId) -> void;
DDSSubscription fDDS; DDSSubscription fDDS;
size_t fDDSTaskId; size_t fDDSTaskId;