mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 17:41:45 +00:00
- Proper process termination:
if interrupted with CTRL+C blocking socket calls will return with -1. Each device should call FairMQDevice::Shutdown() before ending the running state to close open sockets, otherwise the interrupt call itself will block. - FIX: Update number of received messages for FairMQFileSink. - Add ability to poll on outputs for FairMQPoller.
This commit is contained in:
committed by
Mohammad Al-Turany
parent
8cd120aef4
commit
0a610926a1
@@ -30,17 +30,17 @@ void FairMQBuffer::Run()
|
||||
|
||||
boost::thread rateLogger(boost::bind(&FairMQDevice::LogSocketRates, this));
|
||||
|
||||
bool received = false;
|
||||
int received = 0;
|
||||
while (fState == RUNNING)
|
||||
{
|
||||
FairMQMessage* msg = fTransportFactory->CreateMessage();
|
||||
|
||||
received = fPayloadInputs->at(0)->Receive(msg);
|
||||
|
||||
if (received)
|
||||
if (received > 0)
|
||||
{
|
||||
fPayloadOutputs->at(0)->Send(msg);
|
||||
received = false;
|
||||
received = 0;
|
||||
}
|
||||
|
||||
delete msg;
|
||||
@@ -52,6 +52,8 @@ void FairMQBuffer::Run()
|
||||
} catch(boost::thread_resource_error& e) {
|
||||
LOG(ERROR) << e.what();
|
||||
}
|
||||
|
||||
FairMQDevice::Shutdown();
|
||||
}
|
||||
|
||||
FairMQBuffer::~FairMQBuffer()
|
||||
|
Reference in New Issue
Block a user