mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 09:31:45 +00:00
Add (optional) Google Protocol Buffers support (example in Tutorial 3).
To use protobuf, run cmake as follows: cmake -DUSE_PROTOBUF=1 .. For this, protobuf library has to be installed on the system. Further changes: Clean up splitter/merger: default are N-to-1-merger and 1-to-N-splitter. Fix bug in nanomsg message deallocation. Setup proper buffer sizes for nanomsg/zeromq via cmake/bash script. chmod +x for start scripts.
This commit is contained in:
@@ -14,7 +14,8 @@
|
||||
|
||||
FairMQMessageNN::FairMQMessageNN() :
|
||||
fSize(0),
|
||||
fMessage(NULL)
|
||||
fMessage(NULL),
|
||||
fReceiving(false)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -25,6 +26,7 @@ FairMQMessageNN::FairMQMessageNN(size_t size)
|
||||
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
|
||||
}
|
||||
fSize = size;
|
||||
fReceiving = false;
|
||||
}
|
||||
|
||||
FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
|
||||
@@ -35,6 +37,7 @@ FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
|
||||
}
|
||||
memcpy (fMessage, data, size);
|
||||
fSize = size;
|
||||
fReceiving = false;
|
||||
}
|
||||
|
||||
void FairMQMessageNN::Rebuild()
|
||||
@@ -42,6 +45,7 @@ void FairMQMessageNN::Rebuild()
|
||||
Clear();
|
||||
fSize = 0;
|
||||
fMessage = NULL;
|
||||
fReceiving = false;
|
||||
}
|
||||
|
||||
void FairMQMessageNN::Rebuild(size_t size)
|
||||
@@ -52,6 +56,7 @@ void FairMQMessageNN::Rebuild(size_t size)
|
||||
LOG(ERROR) << "failed allocating message, reason: " << nn_strerror(errno);
|
||||
}
|
||||
fSize = size;
|
||||
fReceiving = false;
|
||||
}
|
||||
|
||||
void FairMQMessageNN::Rebuild(void* data, size_t size)
|
||||
@@ -63,6 +68,7 @@ void FairMQMessageNN::Rebuild(void* data, size_t size)
|
||||
}
|
||||
memcpy (fMessage, data, size);
|
||||
fSize = size;
|
||||
fReceiving = false;
|
||||
}
|
||||
|
||||
void* FairMQMessageNN::GetMessage()
|
||||
@@ -118,4 +124,13 @@ inline void FairMQMessageNN::Clear()
|
||||
|
||||
FairMQMessageNN::~FairMQMessageNN()
|
||||
{
|
||||
if(fReceiving){
|
||||
int rc = nn_freemsg(fMessage);
|
||||
if (rc < 0) {
|
||||
LOG(ERROR) << "failed freeing message, reason: " << nn_strerror(errno);
|
||||
} else {
|
||||
fMessage = NULL;
|
||||
fSize = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user