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
@@ -29,21 +29,38 @@ FairMQMerger::~FairMQMerger()
|
||||
|
||||
void FairMQMerger::Run()
|
||||
{
|
||||
FairMQPoller* poller = fTransportFactory->CreatePoller(fChannels["data-in"]);
|
||||
FairMQPoller* poller = fTransportFactory->CreatePoller(fChannels.at("data-in"));
|
||||
|
||||
while (GetCurrentState() == RUNNING)
|
||||
// store the channel references to avoid traversing the map on every loop iteration
|
||||
const FairMQChannel& dataOutChannel = fChannels.at("data-out").at(0);
|
||||
FairMQChannel* dataInChannels[fChannels.at("data-in").size()];
|
||||
for (int i = 0; i < fChannels.at("data-in").size(); ++i)
|
||||
{
|
||||
dataInChannels[i] = &(fChannels.at("data-in").at(i));
|
||||
}
|
||||
|
||||
while (CheckCurrentState(RUNNING))
|
||||
{
|
||||
FairMQMessage* msg = fTransportFactory->CreateMessage();
|
||||
|
||||
poller->Poll(100);
|
||||
|
||||
for (int i = 0; i < fChannels["data-in"].size(); ++i)
|
||||
for (int i = 0; i < fChannels.at("data-in").size(); ++i)
|
||||
{
|
||||
if (poller->CheckInput(i))
|
||||
{
|
||||
if (fChannels["data-in"].at(i).Receive(msg))
|
||||
if (dataInChannels[i]->Receive(msg) > 0)
|
||||
{
|
||||
fChannels["data-out"].at(0).Send(msg);
|
||||
if (dataOutChannel.Send(msg) < 0)
|
||||
{
|
||||
LOG(DEBUG) << "Blocking send interrupted by a command";
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG(DEBUG) << "Blocking receive interrupted by a command";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user