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

Extend the FairMQ transport interface by allowing the user of the FairMQMessage class to define his own deallocation function.

Browse Source 
This function will be called when the transport machanism no longer needs the data.

Use this extension with the Protobuf data format, to enable more efficient transport, avoiding memcpy.
This commit is contained in:
Alexey Rybalchenko
2014-06-12 12:47:49 +02:00
parent 865c0e010f
commit 699671a0f1
10 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fairmq/nanomsg/FairMQMessageNN.cxx
View File

@@ -37,7 +37,7 @@ FairMQMessageNN::FairMQMessageNN(size_t size)
fReceiving = false;
}
FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
FairMQMessageNN::FairMQMessageNN(void* data, size_t size, fairmq_free_fn *ffn, void* hint)
{
fMessage = nn_allocmsg(size, 0);
if (!fMessage)
@@ -47,6 +47,15 @@ FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
memcpy(fMessage, data, size);
fSize = size;
fReceiving = false;
if(ffn)
{
ffn(data, hint);
}
else
{
if(data) free(data);
}
}
void FairMQMessageNN::Rebuild()
@@ -69,7 +78,7 @@ void FairMQMessageNN::Rebuild(size_t size)
fReceiving = false;
}
void FairMQMessageNN::Rebuild(void* data, size_t size)
void FairMQMessageNN::Rebuild(void* data, size_t size, fairmq_free_fn *ffn, void* hint)
{
Clear();
fMessage = nn_allocmsg(size, 0);
@@ -80,6 +89,15 @@ void FairMQMessageNN::Rebuild(void* data, size_t size)
memcpy(fMessage, data, size);
fSize = size;
fReceiving = false;
if(ffn)
{
ffn(data, hint);
}
else
{
if(data) free(data);
}
}
void* FairMQMessageNN::GetMessage()

4
fairmq/nanomsg/FairMQMessageNN.h
View File

@@ -24,11 +24,11 @@ class FairMQMessageNN : public FairMQMessage
public:
FairMQMessageNN();
FairMQMessageNN(size_t size);
FairMQMessageNN(void* data, size_t size);
FairMQMessageNN(void* data, size_t size, fairmq_free_fn *ffn = NULL, void* hint = NULL);
virtual void Rebuild();
virtual void Rebuild(size_t size);
virtual void Rebuild(void* data, size_t site);
virtual void Rebuild(void* data, size_t size, fairmq_free_fn *ffn = NULL, void* hint = NULL);
virtual void* GetMessage();
virtual void* GetData();

4
fairmq/nanomsg/FairMQTransportFactoryNN.cxx
View File

@@ -29,9 +29,9 @@ FairMQMessage* FairMQTransportFactoryNN::CreateMessage(size_t size)
return new FairMQMessageNN(size);
}
FairMQMessage* FairMQTransportFactoryNN::CreateMessage(void* data, size_t size)
FairMQMessage* FairMQTransportFactoryNN::CreateMessage(void* data, size_t size, fairmq_free_fn *ffn, void* hint)
{
return new FairMQMessageNN(data, size);
return new FairMQMessageNN(data, size, ffn, hint);
}
FairMQSocket* FairMQTransportFactoryNN::CreateSocket(const string& type, int num, int numIoThreads)

2
fairmq/nanomsg/FairMQTransportFactoryNN.h
View File

@@ -29,7 +29,7 @@ class FairMQTransportFactoryNN : public FairMQTransportFactory
virtual FairMQMessage* CreateMessage();
virtual FairMQMessage* CreateMessage(size_t size);
virtual FairMQMessage* CreateMessage(void* data, size_t size);
virtual FairMQMessage* CreateMessage(void* data, size_t size, fairmq_free_fn *ffn = NULL, void* hint = NULL);
virtual FairMQSocket* CreateSocket(const string& type, int num, int numIoThreads);
virtual FairMQPoller* CreatePoller(const vector<FairMQSocket*>& inputs);