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
@@ -18,7 +18,7 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "FairMQConfigurable.h"
|
||||
#include "FairMQStateMachine.h"
|
||||
@@ -42,6 +42,8 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
|
||||
FairMQDevice();
|
||||
|
||||
void CatchSignals();
|
||||
|
||||
virtual void LogSocketRates();
|
||||
|
||||
void SortChannel(const std::string& name, const bool reindex = true);
|
||||
@@ -49,6 +51,9 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
|
||||
void WaitForInitialValidation();
|
||||
|
||||
void InteractiveStateLoop();
|
||||
void PrintInteractiveStateLoopHelp();
|
||||
|
||||
virtual void SetProperty(const int key, const std::string& value);
|
||||
virtual std::string GetProperty(const int key, const std::string& default_ = "");
|
||||
virtual void SetProperty(const int key, const int value);
|
||||
@@ -60,7 +65,7 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
|
||||
virtual ~FairMQDevice();
|
||||
|
||||
std::map< std::string,std::vector<FairMQChannel> > fChannels;
|
||||
std::unordered_map< std::string,std::vector<FairMQChannel> > fChannels;
|
||||
|
||||
protected:
|
||||
std::string fId;
|
||||
@@ -74,7 +79,7 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
|
||||
int fLogIntervalInMs;
|
||||
|
||||
FairMQSocket* fCommandSocket;
|
||||
FairMQSocket* fCmdSocket;
|
||||
|
||||
FairMQTransportFactory* fTransportFactory;
|
||||
|
||||
@@ -95,7 +100,7 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
void ResetWrapper();
|
||||
virtual void Reset();
|
||||
|
||||
virtual void Shutdown();
|
||||
void Shutdown();
|
||||
|
||||
void Terminate();
|
||||
void SendCommand(const std::string& command);
|
||||
@@ -108,6 +113,9 @@ class FairMQDevice : public FairMQStateMachine, public FairMQConfigurable
|
||||
boost::condition_variable fInitialValidationCondition;
|
||||
boost::mutex fInitialValidationMutex;
|
||||
|
||||
void SignalHandler(int signal);
|
||||
bool fCatchingSignals;
|
||||
|
||||
/// Copy Constructor
|
||||
FairMQDevice(const FairMQDevice&);
|
||||
FairMQDevice operator=(const FairMQDevice&);
|
||||
|
Reference in New Issue
Block a user