Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 08:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update multi-part features (nanomsg) and various fixes

Browse Source 
- Implement nanomsg multipart with MessagePack.
 - Use the MessagePack from FairSoft and handle not found case.
 - Update splitter, merger and proxy devices to handle multi-part.
 - Let FairMQParts.At() return pointer reference (can be used for moving).
 - Add missing const specifier in the message interface.
 - Add transmit kernel size setting to channels (ZMQ_SNDBUF).
 - Remove FairMQBuffer device.
 - Remove old multi-part methods from Tutorial3 example (to be replaced with Parts API).
 - Make callback mandatory for newMsg(data, size, callback).
 - Add missing <vector> include in FairMQSocket.
This commit is contained in:
Alexey Rybalchenko 2016-03-21 09:59:00 +01:00
parent 54ff30f055
commit 54a9e44d21
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/MQ/4-copypush/FairMQExample4Sampler.cxx
View File

@ -34,7 +34,10 @@ void FairMQExample4Sampler::Run()
uint64_t* number = new uint64_t(counter); uint64_t* number = new uint64_t(counter);
std::unique_ptr<FairMQMessage> msg(NewMessage(number, sizeof(uint64_t))); std::unique_ptr<FairMQMessage> msg(NewMessage(number, // data pointer
sizeof(uint64_t), // data size
[](void* data, void* hint){ delete static_cast<uint64_t*>(data); } // callback to deallocate after the transfer
));
LOG(INFO) << "Sending \"" << counter << "\""; LOG(INFO) << "Sending \"" << counter << "\"";

11
examples/MQ/8-multipart/FairMQExample8Sampler.cxx
View File

@ -39,12 +39,17 @@ void FairMQExample8Sampler::Run()
// Set stopFlag to 1 for the first 4 messages, and to 0 for the 5th. // Set stopFlag to 1 for the first 4 messages, and to 0 for the 5th.
counter < 5 ? header->stopFlag = 0 : header->stopFlag = 1; counter < 5 ? header->stopFlag = 0 : header->stopFlag = 1;
LOG(INFO) << "Sending header with stopFlag: " << header->stopFlag;
FairMQParts parts; FairMQParts parts;
parts.AddPart(NewMessage(header, sizeof(Ex8Header)));
parts.AddPart(NewMessage(header, // data pointer
sizeof(Ex8Header), // data size
[](void* data, void* hint) { delete static_cast<Ex8Header*>(data); } // callback to deallocate after the transfer
));
parts.AddPart(NewMessage(1000)); parts.AddPart(NewMessage(1000));
LOG(INFO) << "Sending header with stopFlag: " << header->stopFlag; LOG(INFO) << "Sending body of size: " << parts.At(1)->GetSize();
LOG(INFO) << "Sending body of size: " << parts.At(1).GetSize();
Send(parts, "data-out"); Send(parts, "data-out");

4
examples/MQ/8-multipart/FairMQExample8Sink.cxx
View File

@ -37,9 +37,9 @@ void FairMQExample8Sink::Run()
if (Receive(parts, "data-in") >= 0) if (Receive(parts, "data-in") >= 0)
{ {
Ex8Header header; Ex8Header header;
header.stopFlag = (static_cast<Ex8Header*>(parts.At(0).GetData()))->stopFlag; header.stopFlag = (static_cast<Ex8Header*>(parts.At(0)->GetData()))->stopFlag;
LOG(INFO) << "Received header with stopFlag: " << header.stopFlag; LOG(INFO) << "Received header with stopFlag: " << header.stopFlag;
LOG(INFO) << "Received body of size: " << parts.At(1).GetSize(); LOG(INFO) << "Received body of size: " << parts.At(1)->GetSize();
if (header.stopFlag == 1) if (header.stopFlag == 1)
{ {
LOG(INFO) << "Flag is 0, exiting Run()"; LOG(INFO) << "Flag is 0, exiting Run()";