From 7a67719a3c0d3469bb0ecdbc05430391a957cf5d Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 15 May 2020 22:20:14 +0200 Subject: [PATCH] Remove useless members --- fairmq/shmem/Message.cxx | 2 -- fairmq/shmem/Message.h | 4 +--- fairmq/shmem/TransportFactory.cxx | 7 ------- fairmq/shmem/TransportFactory.h | 3 +-- fairmq/zeromq/FairMQMessageZMQ.cxx | 7 ------- fairmq/zeromq/FairMQMessageZMQ.h | 3 +-- fairmq/zeromq/FairMQTransportFactoryZMQ.cxx | 7 ------- fairmq/zeromq/FairMQTransportFactoryZMQ.h | 3 +-- 8 files changed, 4 insertions(+), 32 deletions(-) diff --git a/fairmq/shmem/Message.cxx b/fairmq/shmem/Message.cxx index 3d55d7e3..2536da72 100644 --- a/fairmq/shmem/Message.cxx +++ b/fairmq/shmem/Message.cxx @@ -29,8 +29,6 @@ namespace mq namespace shmem { -Transport Message::fTransportType = Transport::SHM; - Message::Message(Manager& manager, FairMQTransportFactory* factory) : fair::mq::Message{factory} , fManager(manager) diff --git a/fairmq/shmem/Message.h b/fairmq/shmem/Message.h index 3b0e37bf..7646556e 100644 --- a/fairmq/shmem/Message.h +++ b/fairmq/shmem/Message.h @@ -52,7 +52,7 @@ class Message final : public fair::mq::Message bool SetUsedSize(const size_t size) override; - Transport GetType() const override { return fTransportType; } + Transport GetType() const override { return fair::mq::Transport::SHM; } void Copy(const fair::mq::Message& msg) override; @@ -65,8 +65,6 @@ class Message final : public fair::mq::Message mutable Region* fRegionPtr; mutable char* fLocalPtr; - static Transport fTransportType; - bool InitializeChunk(const size_t size); void CloseMessage(); }; diff --git a/fairmq/shmem/TransportFactory.cxx b/fairmq/shmem/TransportFactory.cxx index f885f4d2..104327f6 100644 --- a/fairmq/shmem/TransportFactory.cxx +++ b/fairmq/shmem/TransportFactory.cxx @@ -37,8 +37,6 @@ namespace mq namespace shmem { -Transport TransportFactory::fTransportType = Transport::SHM; - TransportFactory::TransportFactory(const string& id, const ProgOptions* config) : fair::mq::TransportFactory(id) , fDeviceId(id) @@ -199,11 +197,6 @@ vector TransportFactory::GetRegionInfo() return fManager->GetRegionInfo(); } -Transport TransportFactory::GetType() const -{ - return fTransportType; -} - void TransportFactory::Reset() { if (fMsgCounter.load() != 0) { diff --git a/fairmq/shmem/TransportFactory.h b/fairmq/shmem/TransportFactory.h index 9b331b3f..bb92b39c 100644 --- a/fairmq/shmem/TransportFactory.h +++ b/fairmq/shmem/TransportFactory.h @@ -59,7 +59,7 @@ class TransportFactory final : public fair::mq::TransportFactory void UnsubscribeFromRegionEvents() override; std::vector GetRegionInfo() override; - Transport GetType() const override; + Transport GetType() const override { return fair::mq::Transport::SHM; } void Interrupt() override { fManager->Interrupt(); } void Resume() override { fManager->Resume(); } @@ -73,7 +73,6 @@ class TransportFactory final : public fair::mq::TransportFactory private: void SendHeartbeats(); - static Transport fTransportType; std::string fDeviceId; std::string fShmId; void* fZMQContext; diff --git a/fairmq/zeromq/FairMQMessageZMQ.cxx b/fairmq/zeromq/FairMQMessageZMQ.cxx index 07bf2a9f..07b89e56 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.cxx +++ b/fairmq/zeromq/FairMQMessageZMQ.cxx @@ -23,8 +23,6 @@ using namespace std; -fair::mq::Transport FairMQMessageZMQ::fTransportType = fair::mq::Transport::ZMQ; - FairMQMessageZMQ::FairMQMessageZMQ(FairMQTransportFactory* factory) : FairMQMessage{factory} , fUsedSizeModified(false) @@ -202,11 +200,6 @@ void FairMQMessageZMQ::ApplyUsedSize() } } -fair::mq::Transport FairMQMessageZMQ::GetType() const -{ - return fTransportType; -} - void FairMQMessageZMQ::Copy(const FairMQMessage& msg) { const FairMQMessageZMQ& zMsg = static_cast(msg); diff --git a/fairmq/zeromq/FairMQMessageZMQ.h b/fairmq/zeromq/FairMQMessageZMQ.h index 8eeb0d1a..2a87f4be 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.h +++ b/fairmq/zeromq/FairMQMessageZMQ.h @@ -47,7 +47,7 @@ class FairMQMessageZMQ final : public FairMQMessage bool SetUsedSize(const size_t size) override; void ApplyUsedSize(); - fair::mq::Transport GetType() const override; + fair::mq::Transport GetType() const override { return fair::mq::Transport::ZMQ; } void Copy(const FairMQMessage& msg) override; @@ -58,7 +58,6 @@ class FairMQMessageZMQ final : public FairMQMessage size_t fUsedSize; std::unique_ptr fMsg; std::unique_ptr fViewMsg; // view on a subset of fMsg (treating it as user buffer) - static fair::mq::Transport fTransportType; zmq_msg_t* GetMessage() const; void CloseMessage(); diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx index 4d487a93..d15c0791 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx @@ -13,8 +13,6 @@ using namespace std; -fair::mq::Transport FairMQTransportFactoryZMQ::fTransportType = fair::mq::Transport::ZMQ; - FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const fair::mq::ProgOptions* config) : FairMQTransportFactory(id) , fContext(zmq_ctx_new()) @@ -224,11 +222,6 @@ void FairMQTransportFactoryZMQ::RemoveRegion(uint64_t id) fRegionEventsCV.notify_one(); } -fair::mq::Transport FairMQTransportFactoryZMQ::GetType() const -{ - return fTransportType; -} - FairMQTransportFactoryZMQ::~FairMQTransportFactoryZMQ() { LOG(debug) << "Destroying ZeroMQ transport..."; diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.h b/fairmq/zeromq/FairMQTransportFactoryZMQ.h index 40f7d8e4..bc125463 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.h +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.h @@ -61,7 +61,7 @@ class FairMQTransportFactoryZMQ final : public FairMQTransportFactory std::vector GetRegionInfo() override; void RemoveRegion(uint64_t id); - fair::mq::Transport GetType() const override; + fair::mq::Transport GetType() const override { return fair::mq::Transport::ZMQ; } void Interrupt() override { FairMQSocketZMQ::Interrupt(); } void Resume() override { FairMQSocketZMQ::Resume(); } @@ -70,7 +70,6 @@ class FairMQTransportFactoryZMQ final : public FairMQTransportFactory ~FairMQTransportFactoryZMQ() override; private: - static fair::mq::Transport fTransportType; void* fContext; std::mutex fMtx;