diff --git a/fairmq/FairMQMessage.h b/fairmq/FairMQMessage.h index c29fecd2..f4056534 100644 --- a/fairmq/FairMQMessage.h +++ b/fairmq/FairMQMessage.h @@ -35,7 +35,6 @@ class FairMQMessage FairMQTransportFactory* GetTransport() { return fTransport; } //void SetTransport(FairMQTransportFactory* transport) { fTransport = transport; } - virtual void Copy(const std::unique_ptr& msg) __attribute__((deprecated("Use 'Copy(const FairMQMessage& msg)'"))) = 0; virtual void Copy(const FairMQMessage& msg) = 0; virtual ~FairMQMessage() {}; diff --git a/fairmq/nanomsg/FairMQMessageNN.cxx b/fairmq/nanomsg/FairMQMessageNN.cxx index c4b031f0..c5b6a737 100644 --- a/fairmq/nanomsg/FairMQMessageNN.cxx +++ b/fairmq/nanomsg/FairMQMessageNN.cxx @@ -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(msg.get())->GetMessage(), size); - fSize = size; - } -} - void FairMQMessageNN::CloseMessage() { if (nn_freemsg(fMessage) < 0) diff --git a/fairmq/nanomsg/FairMQMessageNN.h b/fairmq/nanomsg/FairMQMessageNN.h index ce506817..762dc13f 100644 --- a/fairmq/nanomsg/FairMQMessageNN.h +++ b/fairmq/nanomsg/FairMQMessageNN.h @@ -49,7 +49,6 @@ class FairMQMessageNN final : public FairMQMessage fair::mq::Transport GetType() const override; void Copy(const FairMQMessage& msg) override; - void Copy(const FairMQMessagePtr& msg) override; ~FairMQMessageNN() override; diff --git a/fairmq/ofi/Message.cxx b/fairmq/ofi/Message.cxx index f4da9a68..3a470702 100644 --- a/fairmq/ofi/Message.cxx +++ b/fairmq/ofi/Message.cxx @@ -138,11 +138,6 @@ auto Message::Copy(const fair::mq::Message& /*msg*/) -> void throw MessageError{"Not yet implemented."}; } -auto Message::Copy(const fair::mq::MessagePtr& /*msg*/) -> void -{ - throw MessageError{"Not yet implemented."}; -} - Message::~Message() { if (fFreeFunction) { diff --git a/fairmq/ofi/Message.h b/fairmq/ofi/Message.h index 17289160..7c933f4b 100644 --- a/fairmq/ofi/Message.h +++ b/fairmq/ofi/Message.h @@ -53,7 +53,6 @@ class Message final : public fair::mq::Message 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::MessagePtr& msg) -> void override; ~Message() override; diff --git a/fairmq/shmem/FairMQMessageSHM.cxx b/fairmq/shmem/FairMQMessageSHM.cxx index bed5912e..ee0a8f12 100644 --- a/fairmq/shmem/FairMQMessageSHM.cxx +++ b/fairmq/shmem/FairMQMessageSHM.cxx @@ -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(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() { if (fHandle >= 0 && !fQueued) diff --git a/fairmq/shmem/FairMQMessageSHM.h b/fairmq/shmem/FairMQMessageSHM.h index d7ddd69d..f96b9e83 100644 --- a/fairmq/shmem/FairMQMessageSHM.h +++ b/fairmq/shmem/FairMQMessageSHM.h @@ -47,7 +47,6 @@ class FairMQMessageSHM final : public FairMQMessage fair::mq::Transport GetType() const override; void Copy(const FairMQMessage& msg) override; - void Copy(const FairMQMessagePtr& msg) override; ~FairMQMessageSHM() override; diff --git a/fairmq/zeromq/FairMQMessageZMQ.cxx b/fairmq/zeromq/FairMQMessageZMQ.cxx index e4a7e2eb..f08088b7 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.cxx +++ b/fairmq/zeromq/FairMQMessageZMQ.cxx @@ -220,24 +220,6 @@ void FairMQMessageZMQ::Copy(const FairMQMessage& msg) } } -void FairMQMessageZMQ::Copy(const FairMQMessagePtr& msg) -{ - FairMQMessageZMQ* msgPtr = static_cast(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() { if (!fViewMsg) diff --git a/fairmq/zeromq/FairMQMessageZMQ.h b/fairmq/zeromq/FairMQMessageZMQ.h index 84a44fad..8eeb0d1a 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.h +++ b/fairmq/zeromq/FairMQMessageZMQ.h @@ -49,7 +49,6 @@ class FairMQMessageZMQ final : public FairMQMessage fair::mq::Transport GetType() const override; - void Copy(const FairMQMessagePtr& msg) override; void Copy(const FairMQMessage& msg) override; ~FairMQMessageZMQ() override;