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

DDS command UI: update to 2.0 (include session arg)

Browse Source
This commit is contained in:
Alexey Rybalchenko 2018-03-21 15:50:17 +01:00 committed by Mohammad Al-Turany
parent 010520dac7
commit 5af82f80c1
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fairmq/plugins/DDS/runDDSCommandUI.cxx
View File

@ -17,8 +17,11 @@
#include <atomic> #include <atomic>
#include <unistd.h> #include <unistd.h>
#include <boost/program_options.hpp>
using namespace std; using namespace std;
using namespace dds::intercom_api; using namespace dds::intercom_api;
namespace bpo = boost::program_options;
void PrintControlsHelp() void PrintControlsHelp()
{ {
@ -29,23 +32,39 @@ void PrintControlsHelp()
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
try try {
{ string sessionID;
char commandChar;
bpo::options_description options("fairmq-dds-command-ui options");
options.add_options()
("session,s", bpo::value<string>(&sessionID)->required(), "DDS Session ID")
("command,c", bpo::value<char> (&commandChar)->default_value(' '), "Command character")
("help,h", "Produce help message");
bpo::variables_map vm;
bpo::store(bpo::command_line_parser(argc, argv).options(options).run(), vm);
bpo::notify(vm);
if (vm.count("help")) {
cout << "FairMQ DDS Command UI" << endl << options << endl;
cout << "possible command characters: [c] check states, [o] dump config, [h] help, [p] pause, [r] run, [s] stop, [t] reset task, [d] reset device, [q] end, [j] init task, [i] init device" << endl;
return EXIT_SUCCESS;
}
CIntercomService service; CIntercomService service;
CCustomCmd ddsCustomCmd(service); CCustomCmd ddsCustomCmd(service);
service.subscribeOnError([](const EErrorCode errorCode, const string& errorMsg) service.subscribeOnError([](const EErrorCode errorCode, const string& errorMsg) {
{
cout << "DDS error received: error code: " << errorCode << ", error message: " << errorMsg << endl; cout << "DDS error received: error code: " << errorCode << ", error message: " << errorMsg << endl;
}); });
// subscribe to receive messages from DDS // subscribe to receive messages from DDS
ddsCustomCmd.subscribe([](const string& msg, const string& /*condition*/, uint64_t /*senderId*/) ddsCustomCmd.subscribe([](const string& msg, const string& /*condition*/, uint64_t /*senderId*/) {
{
cout << "Received: " << msg << endl; cout << "Received: " << msg << endl;
}); });
service.start(); service.start(sessionID);
char c; char c;
@ -55,19 +74,14 @@ int main(int argc, char* argv[])
t.c_lflag &= ~ICANON; // disable canonical input t.c_lflag &= ~ICANON; // disable canonical input
tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings
if (argc != 2) if (commandChar != ' ') {
{ cin.putback(commandChar);
} else {
PrintControlsHelp(); PrintControlsHelp();
} }
else
{
cin.putback(argv[1][0]);
}
while (cin >> c) while (cin >> c) {
{ switch (c) {
switch (c)
{
case 'c': case 'c':
cout << " > checking state of the devices" << endl; cout << " > checking state of the devices" << endl;
ddsCustomCmd.send("check-state", ""); ddsCustomCmd.send("check-state", "");
@ -118,8 +132,7 @@ int main(int argc, char* argv[])
break; break;
} }
if (argc == 2) if (commandChar != ' ') {
{
usleep(50000); usleep(50000);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@ -129,9 +142,7 @@ int main(int argc, char* argv[])
tcgetattr(STDIN_FILENO, &t); // get the current terminal I/O structure tcgetattr(STDIN_FILENO, &t); // get the current terminal I/O structure
t.c_lflag |= ICANON; // re-enable canonical input t.c_lflag |= ICANON; // re-enable canonical input
tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings tcsetattr(STDIN_FILENO, TCSANOW, &t); // apply the new settings
} } catch (exception& e) {
catch (exception& e)
{
cerr << "Error: " << e.what() << endl; cerr << "Error: " << e.what() << endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }