mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-12-14 15:00:17 +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
@@ -42,14 +42,14 @@ void FairMQExample5Client::Run()
|
||||
|
||||
string* text = new string(fText);
|
||||
|
||||
unique_ptr<FairMQMessage> request(fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
|
||||
unique_ptr<FairMQMessage> reply(fTransportFactory->CreateMessage());
|
||||
unique_ptr<FairMQMessage> request(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
|
||||
unique_ptr<FairMQMessage> reply(NewMessage());
|
||||
|
||||
LOG(INFO) << "Sending \"" << fText << "\" to server.";
|
||||
|
||||
if (fChannels.at("data").at(0).Send(request) > 0)
|
||||
if (Send(request, "data") > 0)
|
||||
{
|
||||
if (fChannels.at("data").at(0).Receive(reply) >= 0)
|
||||
if (Receive(reply, "data") >= 0)
|
||||
{
|
||||
LOG(INFO) << "Received reply from server: \"" << string(static_cast<char*>(reply->GetData()), reply->GetSize()) << "\"";
|
||||
}
|
||||
|
||||
@@ -33,9 +33,9 @@ void FairMQExample5Server::Run()
|
||||
{
|
||||
while (CheckCurrentState(RUNNING))
|
||||
{
|
||||
unique_ptr<FairMQMessage> request(fTransportFactory->CreateMessage());
|
||||
unique_ptr<FairMQMessage> request(NewMessage());
|
||||
|
||||
if (fChannels.at("data").at(0).Receive(request) >= 0)
|
||||
if (Receive(request, "data") >= 0)
|
||||
{
|
||||
LOG(INFO) << "Received request from client: \"" << string(static_cast<char*>(request->GetData()), request->GetSize()) << "\"";
|
||||
|
||||
@@ -43,9 +43,9 @@ void FairMQExample5Server::Run()
|
||||
|
||||
LOG(INFO) << "Sending reply to client.";
|
||||
|
||||
unique_ptr<FairMQMessage> reply(fTransportFactory->CreateMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
|
||||
unique_ptr<FairMQMessage> reply(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
|
||||
|
||||
fChannels.at("data").at(0).Send(reply);
|
||||
Send(reply, "data");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user