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

Remove previously deprecated Copy method (since 1yr)

Browse Source
This commit is contained in:
Alexey Rybalchenko 2018-11-28 18:03:45 +01:00 committed by Dennis Klein
parent a9619a06d0
commit ee24144d61
9 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fairmq/FairMQMessage.h
View File

@ -35,7 +35,6 @@ class FairMQMessage
FairMQTransportFactory* GetTransport() { return fTransport; } FairMQTransportFactory* GetTransport() { return fTransport; }
//void SetTransport(FairMQTransportFactory* transport) { fTransport = transport; } //void SetTransport(FairMQTransportFactory* transport) { fTransport = transport; }
virtual void Copy(const std::unique_ptr<FairMQMessage>& msg) __attribute__((deprecated("Use 'Copy(const FairMQMessage& msg)'"))) = 0;
virtual void Copy(const FairMQMessage& msg) = 0; virtual void Copy(const FairMQMessage& msg) = 0;
virtual ~FairMQMessage() {}; virtual ~FairMQMessage() {};

24
fairmq/nanomsg/FairMQMessageNN.cxx
View File

@ -205,30 +205,6 @@ void FairMQMessageNN::Copy(const FairMQMessage& msg)
} }
} }
void FairMQMessageNN::Copy(const FairMQMessagePtr& msg)
{
if (fMessage)
{
if (nn_freemsg(fMessage) < 0)
{
LOG(error) << "failed freeing message, reason: " << nn_strerror(errno);
}
}
size_t size = msg->GetSize();
fMessage = nn_allocmsg(size, 0);
if (!fMessage)
{
LOG(error) << "failed allocating message, reason: " << nn_strerror(errno);
}
else
{
memcpy(fMessage, static_cast<FairMQMessageNN*>(msg.get())->GetMessage(), size);
fSize = size;
}
}
void FairMQMessageNN::CloseMessage() void FairMQMessageNN::CloseMessage()
{ {
if (nn_freemsg(fMessage) < 0) if (nn_freemsg(fMessage) < 0)

1
fairmq/nanomsg/FairMQMessageNN.h
View File

@ -49,7 +49,6 @@ class FairMQMessageNN final : public FairMQMessage
fair::mq::Transport GetType() const override; fair::mq::Transport GetType() const override;
void Copy(const FairMQMessage& msg) override; void Copy(const FairMQMessage& msg) override;
void Copy(const FairMQMessagePtr& msg) override;
~FairMQMessageNN() override; ~FairMQMessageNN() override;

5
fairmq/ofi/Message.cxx
View File

@ -138,11 +138,6 @@ auto Message::Copy(const fair::mq::Message& /*msg*/) -> void
throw MessageError{"Not yet implemented."}; throw MessageError{"Not yet implemented."};
} }
auto Message::Copy(const fair::mq::MessagePtr& /*msg*/) -> void
{
throw MessageError{"Not yet implemented."};
}
Message::~Message() Message::~Message()
{ {
if (fFreeFunction) { if (fFreeFunction) {

1
fairmq/ofi/Message.h
View File

@ -53,7 +53,6 @@ class Message final : public fair::mq::Message
auto GetType() const -> fair::mq::Transport override { return fair::mq::Transport::OFI; } auto GetType() const -> fair::mq::Transport override { return fair::mq::Transport::OFI; }
auto Copy(const fair::mq::Message& msg) -> void override; auto Copy(const fair::mq::Message& msg) -> void override;
auto Copy(const fair::mq::MessagePtr& msg) -> void override;
~Message() override; ~Message() override;

23
fairmq/shmem/FairMQMessageSHM.cxx
View File

@ -316,29 +316,6 @@ void FairMQMessageSHM::Copy(const FairMQMessage& msg)
} }
} }
void FairMQMessageSHM::Copy(const FairMQMessagePtr& msg)
{
if (fHandle < 0)
{
bipc::managed_shared_memory::handle_t otherHandle = static_cast<FairMQMessageSHM*>(msg.get())->fHandle;
if (otherHandle)
{
if (InitializeChunk(msg->GetSize()))
{
memcpy(GetData(), msg->GetData(), msg->GetSize());
}
}
else
{
LOG(error) << "copy fail: source message not initialized!";
}
}
else
{
LOG(error) << "copy fail: target message already initialized!";
}
}
void FairMQMessageSHM::CloseMessage() void FairMQMessageSHM::CloseMessage()
{ {
if (fHandle >= 0 && !fQueued) if (fHandle >= 0 && !fQueued)

1
fairmq/shmem/FairMQMessageSHM.h
View File

@ -47,7 +47,6 @@ class FairMQMessageSHM final : public FairMQMessage
fair::mq::Transport GetType() const override; fair::mq::Transport GetType() const override;
void Copy(const FairMQMessage& msg) override; void Copy(const FairMQMessage& msg) override;
void Copy(const FairMQMessagePtr& msg) override;
~FairMQMessageSHM() override; ~FairMQMessageSHM() override;

18
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@ -220,24 +220,6 @@ void FairMQMessageZMQ::Copy(const FairMQMessage& msg)
} }
} }
void FairMQMessageZMQ::Copy(const FairMQMessagePtr& msg)
{
FairMQMessageZMQ* msgPtr = static_cast<FairMQMessageZMQ*>(msg.get());
// Shares the message buffer between msg and this fMsg.
if (zmq_msg_copy(fMsg.get(), msgPtr->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 (msgPtr->fUsedSizeModified)
{
fUsedSizeModified = true;
fUsedSize = msgPtr->fUsedSize;
}
}
void FairMQMessageZMQ::CloseMessage() void FairMQMessageZMQ::CloseMessage()
{ {
if (!fViewMsg) if (!fViewMsg)

1
fairmq/zeromq/FairMQMessageZMQ.h
View File

@ -49,7 +49,6 @@ class FairMQMessageZMQ final : public FairMQMessage
fair::mq::Transport GetType() const override; fair::mq::Transport GetType() const override;
void Copy(const FairMQMessagePtr& msg) override;
void Copy(const FairMQMessage& msg) override; void Copy(const FairMQMessage& msg) override;
~FairMQMessageZMQ() override; ~FairMQMessageZMQ() override;