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
committed by Mohammad Al-Turany
parent 1bb72fea38
commit bbadf09aad
25 changed files with 102 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/MQ/6-multiple-channels/FairMQExample6Broadcaster.cxx
View File

@@ -38,9 +38,9 @@ void FairMQExample6Broadcaster::Run()
boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
string* text = new string("OK");
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
LOG(INFO) << "Sending \"" << "OK" << "\"";
fChannels.at("broadcast-out").at(0).Send(msg);
unique_ptr<FairMQMessage> msg(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
LOG(INFO) << "Sending OK";
Send(msg, "broadcast");
}
}

20
examples/MQ/6-multiple-channels/FairMQExample6Sampler.cxx
View File

@@ -34,37 +34,37 @@ void FairMQExample6Sampler::CustomCleanup(void *data, void *object)
void FairMQExample6Sampler::Run()
{
std::unique_ptr<FairMQPoller> poller(fTransportFactory->CreatePoller(fChannels, { "data-out", "broadcast-in" }));
std::unique_ptr<FairMQPoller> poller(fTransportFactory->CreatePoller(fChannels, { "data", "broadcast" }));
while (CheckCurrentState(RUNNING))
{
poller->Poll(-1);
if (poller->CheckInput("broadcast-in", 0))
if (poller->CheckInput("broadcast", 0))
{
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
unique_ptr<FairMQMessage> msg(NewMessage());
if (fChannels.at("broadcast-in").at(0).Receive(msg) > 0)
if (Receive(msg, "broadcast") > 0)
{
LOG(INFO) << "Received broadcast: \""
<< string(static_cast<char*>(msg->GetData()), msg->GetSize())
<< "\"";
}
} // if (poller->CheckInput("broadcast-in", 0))
}
if (poller->CheckOutput("data-out", 0))
if (poller->CheckOutput("data", 0))
{
boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
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);
} // if (poller->CheckOutput("data-out", 0))
} // while (CheckCurrentState(RUNNING))
Send(msg, "data");
}
}
}
FairMQExample6Sampler::~FairMQExample6Sampler()

22
examples/MQ/6-multiple-channels/FairMQExample6Sink.cxx
View File

@@ -24,33 +24,29 @@ FairMQExample6Sink::FairMQExample6Sink()
void FairMQExample6Sink::Run()
{
std::unique_ptr<FairMQPoller> poller(fTransportFactory->CreatePoller(fChannels, { "data-in", "broadcast-in" }));
std::unique_ptr<FairMQPoller> poller(fTransportFactory->CreatePoller(fChannels, { "data", "broadcast" }));
while (CheckCurrentState(RUNNING))
{
poller->Poll(-1);
if (poller->CheckInput("broadcast-in", 0))
if (poller->CheckInput("broadcast", 0))
{
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
unique_ptr<FairMQMessage> msg(NewMessage());
if (fChannels.at("broadcast-in").at(0).Receive(msg) > 0)
if (Receive(msg, "broadcast") > 0)
{
LOG(INFO) << "Received broadcast: \""
<< string(static_cast<char*>(msg->GetData()), msg->GetSize())
<< "\"";
LOG(INFO) << "Received broadcast: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
}
}
if (poller->CheckInput("data-in", 0))
if (poller->CheckInput("data", 0))
{
unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
unique_ptr<FairMQMessage> msg(NewMessage());
if (fChannels.at("data-in").at(0).Receive(msg) > 0)
if (Receive(msg, "data") > 0)
{
LOG(INFO) << "Received message: \""
<< string(static_cast<char*>(msg->GetData()), msg->GetSize())
<< "\"";
LOG(INFO) << "Received message: \"" << string(static_cast<char*>(msg->GetData()), msg->GetSize()) << "\"";
}
}
}

10
examples/MQ/6-multiple-channels/ex6-multiple-channels.json
View File

@@ -6,7 +6,7 @@
"id": "sampler1",
"channel":
{
"name": "data-out",
"name": "data",
"socket":
{
"type": "push",
@@ -19,7 +19,7 @@
},
"channel":
{
"name": "broadcast-in",
"name": "broadcast",
"socket":
{
"type": "sub",
@@ -37,7 +37,7 @@
"id": "sink1",
"channel":
{
"name": "data-in",
"name": "data",
"socket":
{
"type": "pull",
@@ -50,7 +50,7 @@
},
"channel":
{
"name": "broadcast-in",
"name": "broadcast",
"socket":
{
"type": "sub",
@@ -68,7 +68,7 @@
"id": "broadcaster1",
"channel":
{
"name": "broadcast-out",
"name": "broadcast",
"socket":
{
"type": "pub",