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

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

8
examples/MQ/2-sampler-processor-sink/FairMQExample2Processor.cxx
View File

@@ -36,11 +36,11 @@ void FairMQExample2Processor::Run()
while (CheckCurrentState(RUNNING))
{
// Create empty message to hold the input
unique_ptr<FairMQMessage> input(fTransportFactory->CreateMessage());
unique_ptr<FairMQMessage> input(NewMessage());
// Receive the message (blocks until received or interrupted (e.g. by state change)).
// Returns size of the received message or -1 if interrupted.
if (fChannels.at("data-in").at(0).Receive(input) >= 0)
if (Receive(input, "data1") >= 0)
{
LOG(INFO) << "Received data, processing...";
@@ -49,10 +49,10 @@ void FairMQExample2Processor::Run()
*text += " (modified by " + fId + ")";
// Create output message
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
unique_ptr<FairMQMessage> msg(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
// Send out the output message
fChannels.at("data-out").at(0).Send(msg);
Send(msg, "data2");
}
}
}

4
examples/MQ/2-sampler-processor-sink/FairMQExample2Sampler.cxx
View File

@@ -39,11 +39,11 @@ void FairMQExample2Sampler::Run()
string* text = new string(fText);
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
unique_ptr<FairMQMessage> msg(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
LOG(INFO) << "Sending \"" << fText << "\"";
fChannels.at("data-out").at(0).Send(msg);
Send(msg, "data1");
}
}

4
examples/MQ/2-sampler-processor-sink/FairMQExample2Sink.cxx
View File

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

12
examples/MQ/2-sampler-processor-sink/ex2-sampler-processor-sink.json
View File

@@ -6,7 +6,7 @@
"id": "sampler1",
"channel":
{
"name": "data-out",
"name": "data1",
"socket":
{
"type": "push",
@@ -24,7 +24,7 @@
"id": "processor1",
"channel":
{
"name": "data-in",
"name": "data1",
"socket":
{
"type": "pull",
@@ -37,7 +37,7 @@
},
"channel":
{
"name": "data-out",
"name": "data2",
"socket":
{
"type": "push",
@@ -55,7 +55,7 @@
"id": "processor2",
"channel":
{
"name": "data-in",
"name": "data1",
"socket":
{
"type": "pull",
@@ -68,7 +68,7 @@
},
"channel":
{
"name": "data-out",
"name": "data2",
"socket":
{
"type": "push",
@@ -86,7 +86,7 @@
"id": "sink1",
"channel":
{
"name": "data-in",
"name": "data2",
"socket":
{
"type": "pull",