mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 09:31:45 +00:00
Several FairMQ fixes and improvements:
- FairMQ: add possibility to poll on multiple channels. - FairMQ: include command channel when polling on blocking calls (for unblocking without termination). - FairMQ: move signal handler inside of FairMQDevice class (call FairMQDevice::CatchSignals() in the main function). - FairMQ: add 'bool CheckCurrentState(statename)' (instead of 'GetCurrentState() == statename' that cannot be thread safe). - FairMQDevice: add 'InteractiveStateLoop()' method that can be used to change states from the command line. - FairMQDevice: add automatic transition to IDLE state if Run() exits without an external event. - FairMQDevice: implement device reset. - FairMQDevice: use unordered_map for device channels. - FairMQChannel: improve address validation for channels. - FairMQChannel: add ExpectsAnotherPart() method to check if another msg part is expected (old approach still works). - FairMQ: remove invalid transition from the run files. - FairMQFileSink: disable ROOT termination signal handler. - Tutorial3: spawn xterm windows from start scripts without overlapping for better visibility. - FairMQ Examples: update protobuf test and move its files to a common directory. - FairMQStateMachine: improve feedback on invalid transitions (more readable).
This commit is contained in:
committed by
Mohammad Al-Turany
parent
d1bba61939
commit
1302e77a16
@@ -47,8 +47,8 @@ void FairMQExampleClient::Run()
|
||||
|
||||
LOG(INFO) << "Sending \"" << fText << "\" to server.";
|
||||
|
||||
fChannels["data"].at(0).Send(request);
|
||||
fChannels["data"].at(0).Receive(reply);
|
||||
fChannels.at("data").at(0).Send(request);
|
||||
fChannels.at("data").at(0).Receive(reply);
|
||||
|
||||
LOG(INFO) << "Received reply from server: \"" << string(static_cast<char*>(reply->GetData()), reply->GetSize()) << "\"";
|
||||
|
||||
|
@@ -37,7 +37,7 @@ void FairMQExampleServer::Run()
|
||||
|
||||
FairMQMessage* request = fTransportFactory->CreateMessage();
|
||||
|
||||
fChannels["data"].at(0).Receive(request);
|
||||
fChannels.at("data").at(0).Receive(request);
|
||||
|
||||
LOG(INFO) << "Received request from client: \"" << string(static_cast<char*>(request->GetData()), request->GetSize()) << "\"";
|
||||
|
||||
@@ -49,7 +49,7 @@ void FairMQExampleServer::Run()
|
||||
|
||||
FairMQMessage* reply = fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text);
|
||||
|
||||
fChannels["data"].at(0).Send(reply);
|
||||
fChannels.at("data").at(0).Send(reply);
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include <csignal>
|
||||
|
||||
#include "boost/program_options.hpp"
|
||||
|
||||
@@ -28,28 +27,6 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
FairMQExampleClient client;
|
||||
|
||||
static void s_signal_handler(int signal)
|
||||
{
|
||||
LOG(INFO) << "Caught signal " << signal;
|
||||
|
||||
client.ChangeState(FairMQExampleClient::END);
|
||||
|
||||
LOG(INFO) << "Shutdown complete.";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void s_catch_signals(void)
|
||||
{
|
||||
struct sigaction action;
|
||||
action.sa_handler = s_signal_handler;
|
||||
action.sa_flags = 0;
|
||||
sigemptyset(&action.sa_mask);
|
||||
sigaction(SIGINT, &action, NULL);
|
||||
sigaction(SIGTERM, &action, NULL);
|
||||
}
|
||||
|
||||
typedef struct DeviceOptions
|
||||
{
|
||||
DeviceOptions() :
|
||||
@@ -72,7 +49,7 @@ inline bool parse_cmd_line(int _argc, char* _argv[], DeviceOptions* _options)
|
||||
bpo::variables_map vm;
|
||||
bpo::store(bpo::parse_command_line(_argc, _argv, desc), vm);
|
||||
|
||||
if ( vm.count("help") )
|
||||
if (vm.count("help"))
|
||||
{
|
||||
LOG(INFO) << "EPN" << endl << desc;
|
||||
return false;
|
||||
@@ -88,7 +65,8 @@ inline bool parse_cmd_line(int _argc, char* _argv[], DeviceOptions* _options)
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
s_catch_signals();
|
||||
FairMQExampleClient client;
|
||||
client.CatchSignals();
|
||||
|
||||
DeviceOptions_t options;
|
||||
try
|
||||
@@ -122,24 +100,14 @@ int main(int argc, char** argv)
|
||||
|
||||
client.fChannels["data"].push_back(requestChannel);
|
||||
|
||||
client.ChangeState(FairMQExampleClient::INIT_DEVICE);
|
||||
client.WaitForEndOfState(FairMQExampleClient::INIT_DEVICE);
|
||||
client.ChangeState("INIT_DEVICE");
|
||||
client.WaitForEndOfState("INIT_DEVICE");
|
||||
|
||||
client.ChangeState(FairMQExampleClient::INIT_TASK);
|
||||
client.WaitForEndOfState(FairMQExampleClient::INIT_TASK);
|
||||
client.ChangeState("INIT_TASK");
|
||||
client.WaitForEndOfState("INIT_TASK");
|
||||
|
||||
client.ChangeState(FairMQExampleClient::RUN);
|
||||
client.WaitForEndOfState(FairMQExampleClient::RUN);
|
||||
|
||||
client.ChangeState(FairMQExampleClient::STOP);
|
||||
|
||||
client.ChangeState(FairMQExampleClient::RESET_TASK);
|
||||
client.WaitForEndOfState(FairMQExampleClient::RESET_TASK);
|
||||
|
||||
client.ChangeState(FairMQExampleClient::RESET_DEVICE);
|
||||
client.WaitForEndOfState(FairMQExampleClient::RESET_DEVICE);
|
||||
|
||||
client.ChangeState(FairMQExampleClient::END);
|
||||
client.ChangeState("RUN");
|
||||
client.InteractiveStateLoop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@@ -13,7 +13,6 @@
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include <csignal>
|
||||
|
||||
#include "FairMQLogger.h"
|
||||
#include "FairMQExampleServer.h"
|
||||
@@ -26,31 +25,10 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
FairMQExampleServer server;
|
||||
|
||||
static void s_signal_handler(int signal)
|
||||
{
|
||||
LOG(INFO) << "Caught signal " << signal;
|
||||
|
||||
server.ChangeState(FairMQExampleServer::END);
|
||||
|
||||
LOG(INFO) << "Caught signal " << signal;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void s_catch_signals(void)
|
||||
{
|
||||
struct sigaction action;
|
||||
action.sa_handler = s_signal_handler;
|
||||
action.sa_flags = 0;
|
||||
sigemptyset(&action.sa_mask);
|
||||
sigaction(SIGINT, &action, NULL);
|
||||
sigaction(SIGTERM, &action, NULL);
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
s_catch_signals();
|
||||
FairMQExampleServer server;
|
||||
server.CatchSignals();
|
||||
|
||||
LOG(INFO) << "PID: " << getpid();
|
||||
|
||||
@@ -72,24 +50,14 @@ int main(int argc, char** argv)
|
||||
|
||||
server.fChannels["data"].push_back(replyChannel);
|
||||
|
||||
server.ChangeState(FairMQExampleServer::INIT_DEVICE);
|
||||
server.WaitForEndOfState(FairMQExampleServer::INIT_DEVICE);
|
||||
server.ChangeState("INIT_DEVICE");
|
||||
server.WaitForEndOfState("INIT_DEVICE");
|
||||
|
||||
server.ChangeState(FairMQExampleServer::INIT_TASK);
|
||||
server.WaitForEndOfState(FairMQExampleServer::INIT_TASK);
|
||||
server.ChangeState("INIT_TASK");
|
||||
server.WaitForEndOfState("INIT_TASK");
|
||||
|
||||
server.ChangeState(FairMQExampleServer::RUN);
|
||||
server.WaitForEndOfState(FairMQExampleServer::RUN);
|
||||
|
||||
server.ChangeState(FairMQExampleServer::STOP);
|
||||
|
||||
server.ChangeState(FairMQExampleServer::RESET_TASK);
|
||||
server.WaitForEndOfState(FairMQExampleServer::RESET_TASK);
|
||||
|
||||
server.ChangeState(FairMQExampleServer::RESET_DEVICE);
|
||||
server.WaitForEndOfState(FairMQExampleServer::RESET_DEVICE);
|
||||
|
||||
server.ChangeState(FairMQExampleServer::END);
|
||||
server.ChangeState("RUN");
|
||||
server.InteractiveStateLoop();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user