Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-16 18:11:49 +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 82ab7670a9
commit e1fef82657
33 changed files with 393 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fairmq/test/pub-sub/FairMQTestPub.cxx
View File

@@ -23,21 +23,21 @@ FairMQTestPub::FairMQTestPub()
void FairMQTestPub::Run()
{
std::unique_ptr<FairMQMessage> ready1Msg(fTransportFactory->CreateMessage());
int r1 = fChannels.at("control").at(0).Receive(ready1Msg);
std::unique_ptr<FairMQMessage> ready2Msg(fTransportFactory->CreateMessage());
int r2 = fChannels.at("control").at(0).Receive(ready2Msg);
std::unique_ptr<FairMQMessage> ready1Msg(NewMessage());
int r1 = Receive(ready1Msg, "control");
std::unique_ptr<FairMQMessage> ready2Msg(NewMessage());
int r2 = Receive(ready2Msg, "control");
if (r1 >= 0 && r2 >= 0)
{
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
fChannels.at("data").at(0).Send(msg);
std::unique_ptr<FairMQMessage> msg(NewMessage());
Send(msg, "data");
std::unique_ptr<FairMQMessage> ack1Msg(fTransportFactory->CreateMessage());
std::unique_ptr<FairMQMessage> ack2Msg(fTransportFactory->CreateMessage());
if (fChannels.at("control").at(0).Receive(ack1Msg) >= 0)
std::unique_ptr<FairMQMessage> ack1Msg(NewMessage());
std::unique_ptr<FairMQMessage> ack2Msg(NewMessage());
if (Receive(ack1Msg, "control") >= 0)
{
if (fChannels.at("control").at(0).Receive(ack2Msg) >= 0)
if (Receive(ack2Msg, "control") >= 0)
{
LOG(INFO) << "PUB-SUB test successfull";
}

12
fairmq/test/pub-sub/FairMQTestSub.cxx
View File

@@ -23,14 +23,14 @@ FairMQTestSub::FairMQTestSub()
void FairMQTestSub::Run()
{
std::unique_ptr<FairMQMessage> readyMsg(fTransportFactory->CreateMessage());
fChannels.at("control").at(0).Send(readyMsg);
std::unique_ptr<FairMQMessage> readyMsg(NewMessage());
Send(readyMsg, "control");
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
if (fChannels.at("data").at(0).Receive(msg) >= 0)
std::unique_ptr<FairMQMessage> msg(NewMessage());
if (Receive(msg, "data") >= 0)
{
std::unique_ptr<FairMQMessage> ackMsg(fTransportFactory->CreateMessage());
fChannels.at("control").at(0).Send(ackMsg);
std::unique_ptr<FairMQMessage> ackMsg(NewMessage());
Send(ackMsg, "control");
}
else
{

4
fairmq/test/push-pull/FairMQTestPull.cxx
View File

@@ -23,9 +23,9 @@ FairMQTestPull::FairMQTestPull()
void FairMQTestPull::Run()
{
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
std::unique_ptr<FairMQMessage> msg(NewMessage());
if (fChannels.at("data").at(0).Receive(msg) >= 0)
if (Receive(msg, "data") >= 0)
{
LOG(INFO) << "PUSH-PULL test successfull";
}

4
fairmq/test/push-pull/FairMQTestPush.cxx
View File

@@ -23,8 +23,8 @@ FairMQTestPush::FairMQTestPush()
void FairMQTestPush::Run()
{
std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
fChannels.at("data").at(0).Send(msg);
std::unique_ptr<FairMQMessage> msg(NewMessage());
Send(msg, "data");
}
FairMQTestPush::~FairMQTestPush()

8
fairmq/test/req-rep/FairMQTestRep.cxx
View File

@@ -23,11 +23,11 @@ FairMQTestRep::FairMQTestRep()
void FairMQTestRep::Run()
{
std::unique_ptr<FairMQMessage> request(fTransportFactory->CreateMessage());
if (fChannels.at("data").at(0).Receive(request) >= 0)
std::unique_ptr<FairMQMessage> request(NewMessage());
if (Receive(request, "data") >= 0)
{
std::unique_ptr<FairMQMessage> reply(fTransportFactory->CreateMessage());
fChannels.at("data").at(0).Send(reply);
std::unique_ptr<FairMQMessage> reply(NewMessage());
Send(reply, "data");
}
}

8
fairmq/test/req-rep/FairMQTestReq.cxx
View File

@@ -23,11 +23,11 @@ FairMQTestReq::FairMQTestReq()
void FairMQTestReq::Run()
{
std::unique_ptr<FairMQMessage> request(fTransportFactory->CreateMessage());
fChannels.at("data").at(0).Send(request);
std::unique_ptr<FairMQMessage> request(NewMessage());
Send(request, "data");
std::unique_ptr<FairMQMessage> reply(fTransportFactory->CreateMessage());
if (fChannels.at("data").at(0).Receive(reply) >= 0)
std::unique_ptr<FairMQMessage> reply(NewMessage());
if (Receive(reply, "data") >= 0)
{
LOG(INFO) << "REQ-REP test successfull";
}

9
fairmq/test/runTransferTimeoutTest.cxx
View File

@@ -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;