Enable new callback API

- OnData() channel data handler.
 - ConditionalRun() for devices without incoming data.
 - Header file with common main(), to be extended with getDevice/addCustomOptions.
 - Update examples (MQ/Tutorial3) to use the new API and config.
 - NewSimpleMessage() for simpler creation of small messages (additional copy).
 - Replace SetProperty/GetProperty with fConfig access.
 - Runtime configurable channel names for common devices.
 - Configurable logging interval per channel.
 - FairMQMultiplier for distributing same data to multiple outputs.
 - Cleanup state machine messages.
 - Cmd option to toggle signal handling.
 - Simpler API for send/receive timeouts.
 - Enable --log-to-file.
 - Fix coverity issues, warnings.
 - Various code cleanup and minor tweaks.
This commit is contained in:
Alexey Rybalchenko
2016-08-10 09:47:53 +02:00
committed by Mohammad Al-Turany
parent d5b98567db
commit da10c64800
53 changed files with 501 additions and 1263 deletions

View File

@@ -12,52 +12,39 @@
* @author A. Rybalchenko
*/
#include <memory> // unique_ptr
#include <boost/thread.hpp>
#include <boost/bind.hpp>
#include <thread> // this_thread::sleep_for
#include <chrono>
#include "FairMQExample4Sampler.h"
#include "FairMQLogger.h"
FairMQExample4Sampler::FairMQExample4Sampler()
: fNumDataChannels(0)
, fCounter(0)
{
}
void FairMQExample4Sampler::Run()
void FairMQExample4Sampler::InitTask()
{
uint64_t counter = 0;
fNumDataChannels = fChannels.at("data").size();
}
while (CheckCurrentState(RUNNING))
bool FairMQExample4Sampler::ConditionalRun()
{
std::this_thread::sleep_for(std::chrono::seconds(1));
// NewSimpleMessage creates a copy of the data and takes care of its destruction (after the transfer takes place).
// Should only be used for small data because of the cost of an additional copy
FairMQMessagePtr msg(NewSimpleMessage(fCounter++));
for (int i = 0; i < fNumDataChannels - 1; ++i)
{
boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
uint64_t* number = new uint64_t(counter);
std::unique_ptr<FairMQMessage> msg(NewMessage(number, // data pointer
sizeof(uint64_t), // data size
[](void* data, void* /*hint*/){ delete static_cast<uint64_t*>(data); } // callback to deallocate after the transfer
));
LOG(INFO) << "Sending \"" << counter << "\"";
if (fChannels.at("data").size() > 1)
{
for (unsigned int i = 1; i < fChannels.at("data").size(); ++i)
{
std::unique_ptr<FairMQMessage> msgCopy(NewMessage());
msgCopy->Copy(msg);
Send(msgCopy, "data", i);
}
Send(msg, "data");
}
else
{
Send(msg, "data");
}
++counter;
FairMQMessagePtr msgCopy(NewMessage());
msgCopy->Copy(msg);
Send(msgCopy, "data", i);
}
Send(msg, "data", fNumDataChannels - 1);
return true;
}
FairMQExample4Sampler::~FairMQExample4Sampler()