mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 09:31:45 +00:00
FairMQ: Extend Multipart and messaging API
- 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:
committed by
Mohammad Al-Turany
parent
1bb72fea38
commit
bbadf09aad
@@ -39,11 +39,11 @@ void FairMQExample1Sampler::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, "data");
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -25,9 +25,9 @@ void FairMQExample1Sink::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, "data") >= 0)
|
||||
{
|
||||
LOG(INFO) << "Received message: \""
|
||||
<< string(static_cast<char*>(msg->GetData()), msg->GetSize())
|
||||
|
@@ -6,7 +6,7 @@
|
||||
"id": "sampler1",
|
||||
"channel":
|
||||
{
|
||||
"name": "data-out",
|
||||
"name": "data",
|
||||
"socket":
|
||||
{
|
||||
"type": "push",
|
||||
@@ -24,7 +24,7 @@
|
||||
"id": "sink1",
|
||||
"channel":
|
||||
{
|
||||
"name": "data-in",
|
||||
"name": "data",
|
||||
"socket":
|
||||
{
|
||||
"type": "pull",
|
||||
|
Reference in New Issue
Block a user