Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable new callback API

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

55
examples/MQ/4-copypush/FairMQExample4Sampler.cxx
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()

10
examples/MQ/4-copypush/FairMQExample4Sampler.h
View File

@@ -15,10 +15,10 @@
#ifndef FAIRMQEXAMPLE4SAMPLER_H_
#define FAIRMQEXAMPLE4SAMPLER_H_
#include <string>
#include "FairMQDevice.h"
#include <stdint.h> // uint64_t
class FairMQExample4Sampler : public FairMQDevice
{
public:
@@ -26,7 +26,11 @@ class FairMQExample4Sampler : public FairMQDevice
virtual ~FairMQExample4Sampler();
protected:
virtual void Run();
virtual void InitTask();
virtual bool ConditionalRun();
int fNumDataChannels;
uint64_t fCounter;
};
#endif /* FAIRMQEXAMPLE4SAMPLER_H_ */

21
examples/MQ/4-copypush/FairMQExample4Sink.cxx
View File

@@ -12,29 +12,22 @@
* @author A. Rybalchenko
*/
#include <memory>
#include <boost/thread.hpp>
#include <boost/bind.hpp>
#include "FairMQExample4Sink.h"
#include "FairMQLogger.h"
#include <stdint.h> // uint64_t
FairMQExample4Sink::FairMQExample4Sink()
{
OnData("data", &FairMQExample4Sink::HandleData);
}
void FairMQExample4Sink::Run()
bool FairMQExample4Sink::HandleData(FairMQMessagePtr& msg, int /*index*/)
{
while (CheckCurrentState(RUNNING))
{
std::unique_ptr<FairMQMessage> msg(NewMessage());
LOG(INFO) << "Received message: \"" << *(static_cast<uint64_t*>(msg->GetData())) << "\"";
if (Receive(msg, "data") >= 0)
{
LOG(INFO) << "Received message: \"" << *(static_cast<int*>(msg->GetData())) << "\"";
}
}
// return true if want to be called again (otherwise go to IDLE state)
return true;
}
FairMQExample4Sink::~FairMQExample4Sink()

2
examples/MQ/4-copypush/FairMQExample4Sink.h
View File

@@ -24,7 +24,7 @@ class FairMQExample4Sink : public FairMQDevice
virtual ~FairMQExample4Sink();
protected:
virtual void Run();
bool HandleData(FairMQMessagePtr&, int);
};
#endif /* FAIRMQEXAMPLE4SINK_H_ */

46
examples/MQ/4-copypush/runExample4Sampler.cxx
View File

@@ -5,45 +5,17 @@
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
/**
* runExample4Sampler.cxx
*
* @since 2013-04-23
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include "FairMQLogger.h"
#include "FairMQProgOptions.h"
#include "runFairMQDevice.h"
#include "FairMQExample4Sampler.h"
int main(int argc, char** argv)
namespace bpo = boost::program_options;
void addCustomOptions(bpo::options_description& /*options*/)
{
try
{
FairMQProgOptions config;
config.ParseAll(argc, argv);
FairMQExample4Sampler sampler;
sampler.CatchSignals();
sampler.SetConfig(config);
sampler.ChangeState("INIT_DEVICE");
sampler.WaitForEndOfState("INIT_DEVICE");
sampler.ChangeState("INIT_TASK");
sampler.WaitForEndOfState("INIT_TASK");
sampler.ChangeState("RUN");
sampler.InteractiveStateLoop();
}
catch (std::exception& e)
{
LOG(ERROR) << "Unhandled Exception reached the top of main: "
<< e.what() << ", application will now exit";
return 1;
}
return 0;
}
FairMQDevice* getDevice(const FairMQProgOptions& /*config*/)
{
return new FairMQExample4Sampler();
}

46
examples/MQ/4-copypush/runExample4Sink.cxx
View File

@@ -5,45 +5,17 @@
* GNU Lesser General Public Licence version 3 (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
/**
* runExample4Sink.cxx
*
* @since 2013-04-23
* @author D. Klein, A. Rybalchenko
*/
#include <iostream>
#include "FairMQLogger.h"
#include "FairMQProgOptions.h"
#include "runFairMQDevice.h"
#include "FairMQExample4Sink.h"
int main(int argc, char** argv)
namespace bpo = boost::program_options;
void addCustomOptions(bpo::options_description& /*options*/)
{
try
{
FairMQProgOptions config;
config.ParseAll(argc, argv);
FairMQExample4Sink sink;
sink.CatchSignals();
sink.SetConfig(config);
sink.ChangeState("INIT_DEVICE");
sink.WaitForEndOfState("INIT_DEVICE");
sink.ChangeState("INIT_TASK");
sink.WaitForEndOfState("INIT_TASK");
sink.ChangeState("RUN");
sink.InteractiveStateLoop();
}
catch (std::exception& e)
{
LOG(ERROR) << "Unhandled Exception reached the top of main: "
<< e.what() << ", application will now exit";
return 1;
}
return 0;
}
FairMQDevice* getDevice(const FairMQProgOptions& /*config*/)
{
return new FairMQExample4Sink();
}