From 3c73c690f7127ab774a409b4e4de0049a4ff727b Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Tue, 14 Mar 2017 11:41:56 +0100 Subject: [PATCH] Transports: use transportType as static member. --- fairmq/nanomsg/FairMQMessageNN.cxx | 5 ++--- fairmq/nanomsg/FairMQMessageNN.h | 1 + fairmq/nanomsg/FairMQTransportFactoryNN.cxx | 4 ++-- fairmq/nanomsg/FairMQTransportFactoryNN.h | 3 +++ fairmq/shmem/FairMQMessageSHM.cxx | 5 ++--- fairmq/shmem/FairMQMessageSHM.h | 1 + fairmq/shmem/FairMQTransportFactorySHM.cxx | 4 ++-- fairmq/shmem/FairMQTransportFactorySHM.h | 3 +++ fairmq/zeromq/FairMQMessageZMQ.cxx | 5 ++--- fairmq/zeromq/FairMQMessageZMQ.h | 1 + fairmq/zeromq/FairMQTransportFactoryZMQ.cxx | 4 ++-- fairmq/zeromq/FairMQTransportFactoryZMQ.h | 3 +++ 12 files changed, 24 insertions(+), 15 deletions(-) diff --git a/fairmq/nanomsg/FairMQMessageNN.cxx b/fairmq/nanomsg/FairMQMessageNN.cxx index 2286f28d..01553a99 100644 --- a/fairmq/nanomsg/FairMQMessageNN.cxx +++ b/fairmq/nanomsg/FairMQMessageNN.cxx @@ -22,9 +22,8 @@ using namespace std; -static FairMQ::Transport gTransportType = FairMQ::Transport::NN; - string FairMQMessageNN::fDeviceID = string(); +FairMQ::Transport FairMQMessageNN::fTransportType = FairMQ::Transport::NN; FairMQMessageNN::FairMQMessageNN() : fMessage(nullptr) @@ -149,7 +148,7 @@ void FairMQMessageNN::SetDeviceId(const string& deviceId) FairMQ::Transport FairMQMessageNN::GetType() const { - return gTransportType; + return fTransportType; } void FairMQMessageNN::Copy(const unique_ptr& msg) diff --git a/fairmq/nanomsg/FairMQMessageNN.h b/fairmq/nanomsg/FairMQMessageNN.h index 57d08b4b..3b507f4b 100644 --- a/fairmq/nanomsg/FairMQMessageNN.h +++ b/fairmq/nanomsg/FairMQMessageNN.h @@ -54,6 +54,7 @@ class FairMQMessageNN : public FairMQMessage size_t fSize; bool fReceiving; static std::string fDeviceID; + static FairMQ::Transport fTransportType; void Clear(); }; diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx index 70164703..49cbc49d 100644 --- a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx +++ b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx @@ -16,7 +16,7 @@ using namespace std; -static FairMQ::Transport gTransportType = FairMQ::Transport::NN; +FairMQ::Transport FairMQTransportFactoryNN::fTransportType = FairMQ::Transport::NN; FairMQTransportFactoryNN::FairMQTransportFactoryNN() { @@ -60,5 +60,5 @@ FairMQPollerPtr FairMQTransportFactoryNN::CreatePoller(const FairMQSocket& cmdSo FairMQ::Transport FairMQTransportFactoryNN::GetType() const { - return gTransportType; + return fTransportType; } diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.h b/fairmq/nanomsg/FairMQTransportFactoryNN.h index df24b2b3..4d7e8305 100644 --- a/fairmq/nanomsg/FairMQTransportFactoryNN.h +++ b/fairmq/nanomsg/FairMQTransportFactoryNN.h @@ -41,6 +41,9 @@ class FairMQTransportFactoryNN : public FairMQTransportFactory virtual FairMQ::Transport GetType() const; virtual ~FairMQTransportFactoryNN() {}; + + private: + static FairMQ::Transport fTransportType; }; #endif /* FAIRMQTRANSPORTFACTORYNN_H_ */ diff --git a/fairmq/shmem/FairMQMessageSHM.cxx b/fairmq/shmem/FairMQMessageSHM.cxx index 776a08d9..41788643 100644 --- a/fairmq/shmem/FairMQMessageSHM.cxx +++ b/fairmq/shmem/FairMQMessageSHM.cxx @@ -14,11 +14,10 @@ using namespace std; using namespace FairMQ::shmem; -static FairMQ::Transport gTransportType = FairMQ::Transport::SHM; - // uint64_t FairMQMessageSHM::fMessageID = 0; // string FairMQMessageSHM::fDeviceID = string(); atomic FairMQMessageSHM::fInterrupted(false); +FairMQ::Transport FairMQMessageSHM::fTransportType = FairMQ::Transport::SHM; FairMQMessageSHM::FairMQMessageSHM() : fMessage() @@ -234,7 +233,7 @@ void FairMQMessageSHM::SetDeviceId(const string& /*deviceId*/) FairMQ::Transport FairMQMessageSHM::GetType() const { - return gTransportType; + return fTransportType; } void FairMQMessageSHM::Copy(const unique_ptr& msg) diff --git a/fairmq/shmem/FairMQMessageSHM.h b/fairmq/shmem/FairMQMessageSHM.h index dfc55e14..49b0da8c 100644 --- a/fairmq/shmem/FairMQMessageSHM.h +++ b/fairmq/shmem/FairMQMessageSHM.h @@ -61,6 +61,7 @@ class FairMQMessageSHM : public FairMQMessage bool fQueued; bool fMetaCreated; static std::atomic fInterrupted; + static FairMQ::Transport fTransportType; bipc::managed_shared_memory::handle_t fHandle; size_t fChunkSize; void* fLocalPtr; diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx index 8537cf76..7e87064d 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.cxx +++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx @@ -12,7 +12,7 @@ using namespace std; -static FairMQ::Transport gTransportType = FairMQ::Transport::SHM; +FairMQ::Transport FairMQTransportFactorySHM::fTransportType = FairMQ::Transport::SHM; FairMQTransportFactorySHM::FairMQTransportFactorySHM() { @@ -59,6 +59,6 @@ FairMQPollerPtr FairMQTransportFactorySHM::CreatePoller(const FairMQSocket& cmdS FairMQ::Transport FairMQTransportFactorySHM::GetType() const { - return gTransportType; + return fTransportType; } diff --git a/fairmq/shmem/FairMQTransportFactorySHM.h b/fairmq/shmem/FairMQTransportFactorySHM.h index c4ed9dfe..f83f037c 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.h +++ b/fairmq/shmem/FairMQTransportFactorySHM.h @@ -35,6 +35,9 @@ class FairMQTransportFactorySHM : public FairMQTransportFactory virtual FairMQ::Transport GetType() const; virtual ~FairMQTransportFactorySHM() {}; + + private: + static FairMQ::Transport fTransportType; }; #endif /* FAIRMQTRANSPORTFACTORYSHM_H_ */ diff --git a/fairmq/zeromq/FairMQMessageZMQ.cxx b/fairmq/zeromq/FairMQMessageZMQ.cxx index af160738..9a2e1e62 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.cxx +++ b/fairmq/zeromq/FairMQMessageZMQ.cxx @@ -20,9 +20,8 @@ using namespace std; -static FairMQ::Transport gTransportType = FairMQ::Transport::ZMQ; - string FairMQMessageZMQ::fDeviceID = string(); +FairMQ::Transport FairMQMessageZMQ::fTransportType = FairMQ::Transport::ZMQ; FairMQMessageZMQ::FairMQMessageZMQ() : fMessage() @@ -105,7 +104,7 @@ void FairMQMessageZMQ::SetDeviceId(const string& deviceId) FairMQ::Transport FairMQMessageZMQ::GetType() const { - return gTransportType; + return fTransportType; } void FairMQMessageZMQ::Copy(const unique_ptr& msg) diff --git a/fairmq/zeromq/FairMQMessageZMQ.h b/fairmq/zeromq/FairMQMessageZMQ.h index 75ecf3eb..f725891e 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.h +++ b/fairmq/zeromq/FairMQMessageZMQ.h @@ -52,6 +52,7 @@ class FairMQMessageZMQ : public FairMQMessage private: zmq_msg_t fMessage; static std::string fDeviceID; + static FairMQ::Transport fTransportType; }; #endif /* FAIRMQMESSAGEZMQ_H_ */ diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx index a423bf78..d9222879 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx @@ -18,7 +18,7 @@ using namespace std; -static FairMQ::Transport gTransportType = FairMQ::Transport::ZMQ; +FairMQ::Transport FairMQTransportFactoryZMQ::fTransportType = FairMQ::Transport::ZMQ; FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ() { @@ -64,5 +64,5 @@ FairMQPollerPtr FairMQTransportFactoryZMQ::CreatePoller(const FairMQSocket& cmdS FairMQ::Transport FairMQTransportFactoryZMQ::GetType() const { - return gTransportType; + return fTransportType; } diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.h b/fairmq/zeromq/FairMQTransportFactoryZMQ.h index 3e9f6ed9..53258ffa 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.h +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.h @@ -42,6 +42,9 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory virtual FairMQ::Transport GetType() const; virtual ~FairMQTransportFactoryZMQ() {}; + + private: + static FairMQ::Transport fTransportType; }; #endif /* FAIRMQTRANSPORTFACTORYZMQ_H_ */