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

FairMQ: add FairMQMessage::Copy(const FairMQMessage& msg), deprecate the old one.

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-12-08 12:02:08 +01:00
committed by Mohammad Al-Turany
parent e340a52bf2
commit ba78964e29
10 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@@ -112,7 +112,7 @@ void FairMQMessageZMQ::Rebuild(void* data, const size_t size, fairmq_free_fn* ff
}
}
zmq_msg_t* FairMQMessageZMQ::GetMessage()
zmq_msg_t* FairMQMessageZMQ::GetMessage() const
{
if (!fViewMsg)
{
@@ -124,7 +124,7 @@ zmq_msg_t* FairMQMessageZMQ::GetMessage()
}
}
void* FairMQMessageZMQ::GetData()
void* FairMQMessageZMQ::GetData() const
{
if (!fViewMsg)
{
@@ -195,6 +195,24 @@ FairMQ::Transport FairMQMessageZMQ::GetType() const
return fTransportType;
}
void FairMQMessageZMQ::Copy(const FairMQMessage& msg)
{
const FairMQMessageZMQ& zMsg = static_cast<const FairMQMessageZMQ&>(msg);
// Shares the message buffer between msg and this fMsg.
if (zmq_msg_copy(fMsg.get(), zMsg.GetMessage()) != 0)
{
LOG(ERROR) << "failed copying message, reason: " << zmq_strerror(errno);
return;
}
// if the target message has been resized, apply same to this message also
if (zMsg.fUsedSizeModified)
{
fUsedSizeModified = true;
fUsedSize = zMsg.fUsedSize;
}
}
void FairMQMessageZMQ::Copy(const FairMQMessagePtr& msg)
{
FairMQMessageZMQ* msgPtr = static_cast<FairMQMessageZMQ*>(msg.get());

5
fairmq/zeromq/FairMQMessageZMQ.h
View File

@@ -40,7 +40,7 @@ class FairMQMessageZMQ : public FairMQMessage
void Rebuild(const size_t size) override;
void Rebuild(void* data, const size_t size, fairmq_free_fn* ffn, void* hint = nullptr) override;
void* GetData() override;
void* GetData() const override;
size_t GetSize() const override;
bool SetUsedSize(const size_t size) override;
@@ -49,6 +49,7 @@ class FairMQMessageZMQ : public FairMQMessage
FairMQ::Transport GetType() const override;
void Copy(const FairMQMessagePtr& msg) override;
void Copy(const FairMQMessage& msg) override;
~FairMQMessageZMQ() override;
@@ -59,7 +60,7 @@ class FairMQMessageZMQ : public FairMQMessage
std::unique_ptr<zmq_msg_t> fViewMsg; // view on a subset of fMsg (treating it as user buffer)
static FairMQ::Transport fTransportType;
zmq_msg_t* GetMessage();
zmq_msg_t* GetMessage() const;
void CloseMessage();
};