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

FairMQ: Extend Multipart and messaging API

Browse Source 
- Extend the multipart API to allow sending vectors of messages or helper
   thin wrapper FairMQParts. See example in examples/MQ/8-multipart.
 - NewMessage() can be used in devices instead of
   fTransportFactory->CreateMessage().
   Possible arguments remain unchanged (no args, size or data+size).
 - Send()/Receive() methods can be used in devices instead of
   fChannels.at("chan").at(i).Send()/Receive():
   Send(msg, "chan", i = 0), Receive(msg, "chan", i = 0).
 - Use the new methods in MQ examples and tests.
 - No breaking changes, but FAIRMQ_INTERFACE_VERSION is incremented to 3
   to allow to check for new methods.
This commit is contained in:
Alexey Rybalchenko
2016-02-23 18:00:35 +01:00
parent 1c710e22f5
commit e3cf68331a
25 changed files with 102 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/MQ/4-copypush/FairMQExample4Sampler.cxx
View File

@@ -34,23 +34,23 @@ void FairMQExample4Sampler::Run()
uint64_t* number = new uint64_t(counter);
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage(number, sizeof(uint64_t)));
std::unique_ptr<FairMQMessage> msg(NewMessage(number, sizeof(uint64_t)));
LOG(INFO) << "Sending \"" << counter << "\"";
if (fChannels.at("data-out").size() > 1)
if (fChannels.at("data").size() > 1)
{
for (int i = 1; i < fChannels.at("data-out").size(); ++i)
for (int i = 1; i < fChannels.at("data").size(); ++i)
{
std::unique_ptr<FairMQMessage> msgCopy(fTransportFactory->CreateMessage());
std::unique_ptr<FairMQMessage> msgCopy(NewMessage());
msgCopy->Copy(msg);
fChannels.at("data-out").at(i).Send(msgCopy);
Send(msgCopy, "data", i);
}
fChannels.at("data-out").at(0).Send(msg);
Send(msg, "data");
}
else
{
fChannels.at("data-out").at(0).Send(msg);
Send(msg, "data");
}
++counter;

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

@@ -28,9 +28,9 @@ void FairMQExample4Sink::Run()
{
while (CheckCurrentState(RUNNING))
{
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
std::unique_ptr<FairMQMessage> msg(NewMessage());
if (fChannels.at("data-in").at(0).Receive(msg) >= 0)
if (Receive(msg, "data") >= 0)
{
LOG(INFO) << "Received message: \"" << *(static_cast<int*>(msg->GetData())) << "\"";
}

6
examples/MQ/4-copypush/ex4-copypush.json
View File

@@ -6,7 +6,7 @@
"id": "sampler1",
"channel":
{
"name": "data-out",
"name": "data",
"socket":
{
"type": "push",
@@ -33,7 +33,7 @@
"id": "sink1",
"channel":
{
"name": "data-in",
"name": "data",
"socket":
{
"type": "pull",
@@ -51,7 +51,7 @@
"id": "sink2",
"channel":
{
"name": "data-in",
"name": "data",
"socket":
{
"type": "pull",