mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-16 01:51: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:
@@ -56,11 +56,10 @@ class TransferTimeoutTester : public FairMQDevice
|
||||
|
||||
if (getSndOK && getRcvOK)
|
||||
{
|
||||
void* buffer = malloc(1000);
|
||||
std::unique_ptr<FairMQMessage> msg1(fTransportFactory->CreateMessage(buffer, 1000));
|
||||
std::unique_ptr<FairMQMessage> msg2(fTransportFactory->CreateMessage());
|
||||
std::unique_ptr<FairMQMessage> msg1(NewMessage());
|
||||
std::unique_ptr<FairMQMessage> msg2(NewMessage());
|
||||
|
||||
if (fChannels.at("data-out").at(0).Send(msg1) == -2)
|
||||
if (Send(msg1, "data-out") == -2)
|
||||
{
|
||||
LOG(INFO) << "send canceled";
|
||||
sendCanceling = true;
|
||||
@@ -70,7 +69,7 @@ class TransferTimeoutTester : public FairMQDevice
|
||||
LOG(ERROR) << "send did not cancel";
|
||||
}
|
||||
|
||||
if (fChannels.at("data-in").at(0).Receive(msg2) == -2)
|
||||
if (Receive(msg2, "data-in") == -2)
|
||||
{
|
||||
LOG(INFO) << "receive canceled";
|
||||
receiveCanceling = true;
|
||||
|
Reference in New Issue
Block a user