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

remove Get/SetMessage from interface (internal transport detail)

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-12-07 13:42:38 +01:00
committed by Mohammad Al-Turany
parent e5aa85b61d
commit ea7ae3ded9
10 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fairmq/nanomsg/FairMQMessageNN.cxx
View File

@@ -94,13 +94,13 @@ FairMQMessageNN::FairMQMessageNN(FairMQUnmanagedRegionPtr& region, void* data, c
void FairMQMessageNN::Rebuild()
{
Clear();
CloseMessage();
fReceiving = false;
}
void FairMQMessageNN::Rebuild(const size_t size)
{
Clear();
CloseMessage();
fMessage = nn_allocmsg(size, 0);
if (!fMessage)
{
@@ -112,7 +112,7 @@ void FairMQMessageNN::Rebuild(const size_t size)
void FairMQMessageNN::Rebuild(void* data, const size_t size, fairmq_free_fn* ffn, void* hint)
{
Clear();
CloseMessage();
fMessage = nn_allocmsg(size, 0);
if (!fMessage)
{
@@ -173,7 +173,7 @@ FairMQ::Transport FairMQMessageNN::GetType() const
return fTransportType;
}
void FairMQMessageNN::Copy(const unique_ptr<FairMQMessage>& msg)
void FairMQMessageNN::Copy(const FairMQMessagePtr& msg)
{
if (fMessage)
{
@@ -192,12 +192,12 @@ void FairMQMessageNN::Copy(const unique_ptr<FairMQMessage>& msg)
}
else
{
memcpy(fMessage, msg->GetMessage(), size);
memcpy(fMessage, static_cast<FairMQMessageNN*>(msg.get())->GetMessage(), size);
fSize = size;
}
}
void FairMQMessageNN::Clear()
void FairMQMessageNN::CloseMessage()
{
if (nn_freemsg(fMessage) < 0)
{
@@ -214,15 +214,6 @@ FairMQMessageNN::~FairMQMessageNN()
{
if (fReceiving)
{
int rc = nn_freemsg(fMessage);
if (rc < 0)
{
LOG(ERROR) << "failed freeing message, reason: " << nn_strerror(errno);
}
else
{
fMessage = nullptr;
fSize = 0;
}
CloseMessage();
}
}