From 7a4fd96b276c93d54e85552081a15f6321e8e7fa Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Fri, 4 May 2018 14:58:14 +0200 Subject: [PATCH] Fix namespaces in Transports.h and add conversion map --- fairmq/FairMQChannel.cxx | 10 +++--- fairmq/FairMQChannel.h | 2 +- fairmq/FairMQDevice.cxx | 8 ++--- fairmq/FairMQDevice.h | 8 ++--- fairmq/FairMQMessage.h | 2 +- fairmq/FairMQTransportFactory.h | 4 +-- fairmq/Transports.h | 34 ++++++++++++--------- fairmq/nanomsg/FairMQMessageNN.cxx | 4 +-- fairmq/nanomsg/FairMQMessageNN.h | 4 +-- fairmq/nanomsg/FairMQTransportFactoryNN.cxx | 4 +-- fairmq/nanomsg/FairMQTransportFactoryNN.h | 4 +-- fairmq/shmem/FairMQMessageSHM.cxx | 4 +-- fairmq/shmem/FairMQMessageSHM.h | 4 +-- fairmq/shmem/FairMQTransportFactorySHM.cxx | 4 +-- fairmq/shmem/FairMQTransportFactorySHM.h | 4 +-- fairmq/zeromq/FairMQMessageZMQ.cxx | 4 +-- fairmq/zeromq/FairMQMessageZMQ.h | 4 +-- fairmq/zeromq/FairMQTransportFactoryZMQ.cxx | 4 +-- fairmq/zeromq/FairMQTransportFactoryZMQ.h | 4 +-- 19 files changed, 61 insertions(+), 55 deletions(-) diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx index fcf5d2e2..82721f45 100644 --- a/fairmq/FairMQChannel.cxx +++ b/fairmq/FairMQChannel.cxx @@ -36,7 +36,7 @@ FairMQChannel::FairMQChannel() , fRateLogging(1) , fName("") , fIsValid(false) - , fTransportType(FairMQ::Transport::DEFAULT) + , fTransportType(fair::mq::Transport::DEFAULT) , fTransportFactory(nullptr) , fMultipart(false) , fModified(true) @@ -57,7 +57,7 @@ FairMQChannel::FairMQChannel(const string& type, const string& method, const str , fRateLogging(1) , fName("") , fIsValid(false) - , fTransportType(FairMQ::Transport::DEFAULT) + , fTransportType(fair::mq::Transport::DEFAULT) , fTransportFactory(nullptr) , fMultipart(false) , fModified(true) @@ -99,7 +99,7 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan) , fRateLogging(chan.fRateLogging) , fName(chan.fName) , fIsValid(false) - , fTransportType(FairMQ::Transport::DEFAULT) + , fTransportType(fair::mq::Transport::DEFAULT) , fTransportFactory(nullptr) , fMultipart(chan.fMultipart) , fModified(chan.fModified) @@ -120,7 +120,7 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan) fSocket = nullptr; fName = chan.fName; fIsValid = false; - fTransportType = FairMQ::Transport::DEFAULT; + fTransportType = fair::mq::Transport::DEFAULT; fTransportFactory = nullptr; return *this; @@ -587,7 +587,7 @@ bool FairMQChannel::ValidateChannel() } // validate channel transport - if (FairMQ::TransportTypes.find(fTransportName) == FairMQ::TransportTypes.end()) + if (fair::mq::TransportTypes.find(fTransportName) == fair::mq::TransportTypes.end()) { ss << "INVALID"; LOG(debug) << ss.str(); diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h index 1daf33e5..5d91d2ef 100644 --- a/fairmq/FairMQChannel.h +++ b/fairmq/FairMQChannel.h @@ -311,7 +311,7 @@ class FairMQChannel std::string fName; std::atomic fIsValid; - FairMQ::Transport fTransportType; + fair::mq::Transport fTransportType; std::shared_ptr fTransportFactory; bool CheckCompatibility(std::unique_ptr& msg) const; diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx index 84d10fe8..880653b6 100644 --- a/fairmq/FairMQDevice.cxx +++ b/fairmq/FairMQDevice.cxx @@ -555,10 +555,10 @@ void FairMQDevice::HandleMultipleChannelInput() fMultitransportInputs.clear(); for (const auto& k : fInputChannelKeys) { - FairMQ::Transport t = fChannels.at(k).at(0).fTransportType; + fair::mq::Transport t = fChannels.at(k).at(0).fTransportType; if (fMultitransportInputs.find(t) == fMultitransportInputs.end()) { - fMultitransportInputs.insert(pair>(t, vector())); + fMultitransportInputs.insert(pair>(t, vector())); fMultitransportInputs.at(t).push_back(k); } else @@ -762,7 +762,7 @@ void FairMQDevice::Pause() shared_ptr FairMQDevice::AddTransport(const string& transport) { - auto i = fTransports.find(FairMQ::TransportTypes.at(transport)); + auto i = fTransports.find(fair::mq::TransportTypes.at(transport)); if (i == fTransports.end()) { @@ -770,7 +770,7 @@ shared_ptr FairMQDevice::AddTransport(const string& tran LOG(debug) << "Adding '" << transport << "' transport to the device."; - pair> trPair(FairMQ::TransportTypes.at(transport), tr); + pair> trPair(fair::mq::TransportTypes.at(transport), tr); fTransports.insert(trPair); return tr; diff --git a/fairmq/FairMQDevice.h b/fairmq/FairMQDevice.h index 43a8c2be..3111cb96 100644 --- a/fairmq/FairMQDevice.h +++ b/fairmq/FairMQDevice.h @@ -253,7 +253,7 @@ class FairMQDevice : public FairMQStateMachine // if more than one channel provided, check compatibility if (chans.size() > 1) { - FairMQ::Transport type = fChannels.at(chans.at(0)).at(0).Transport()->GetType(); + fair::mq::Transport type = fChannels.at(chans.at(0)).at(0).Transport()->GetType(); for (unsigned int i = 1; i < chans.size(); ++i) { @@ -273,7 +273,7 @@ class FairMQDevice : public FairMQStateMachine // if more than one channel provided, check compatibility if (channels.size() > 1) { - FairMQ::Transport type = channels.at(0)->Transport()->GetType(); + fair::mq::Transport type = channels.at(0)->Transport()->GetType(); for (unsigned int i = 1; i < channels.size(); ++i) { @@ -415,7 +415,7 @@ class FairMQDevice : public FairMQStateMachine protected: std::shared_ptr fTransportFactory; ///< Transport factory - std::unordered_map> fTransports; ///< Container for transports + std::unordered_map> fTransports; ///< Container for transports public: std::unordered_map> fChannels; ///< Device channels @@ -521,7 +521,7 @@ class FairMQDevice : public FairMQStateMachine bool fDataCallbacks; std::unordered_map fMsgInputs; std::unordered_map fMultipartInputs; - std::unordered_map> fMultitransportInputs; + std::unordered_map> fMultitransportInputs; std::unordered_map> fChannelRegistry; std::vector fInputChannelKeys; std::mutex fMultitransportMutex; diff --git a/fairmq/FairMQMessage.h b/fairmq/FairMQMessage.h index 69998217..a2d48921 100644 --- a/fairmq/FairMQMessage.h +++ b/fairmq/FairMQMessage.h @@ -28,7 +28,7 @@ class FairMQMessage virtual bool SetUsedSize(const size_t size) = 0; - virtual FairMQ::Transport GetType() const = 0; + virtual fair::mq::Transport GetType() const = 0; virtual void Copy(const std::unique_ptr& msg) __attribute__((deprecated("Use 'Copy(const FairMQMessage& msg)'"))) = 0; virtual void Copy(const FairMQMessage& msg) = 0; diff --git a/fairmq/FairMQTransportFactory.h b/fairmq/FairMQTransportFactory.h index 50633817..72f9214c 100644 --- a/fairmq/FairMQTransportFactory.h +++ b/fairmq/FairMQTransportFactory.h @@ -29,7 +29,7 @@ class FairMQTransportFactory private: /// Topology wide unique id const std::string fkId; - + public: /// ctor /// @param id Topology wide unique id, usually the device id. @@ -69,7 +69,7 @@ class FairMQTransportFactory virtual FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback = nullptr) const = 0; /// Get transport type - virtual FairMQ::Transport GetType() const = 0; + virtual fair::mq::Transport GetType() const = 0; virtual void Interrupt() = 0; virtual void Resume() = 0; diff --git a/fairmq/Transports.h b/fairmq/Transports.h index 5fced5c5..2f525bed 100644 --- a/fairmq/Transports.h +++ b/fairmq/Transports.h @@ -15,8 +15,9 @@ #include #include -/// TODO deprecate this namespace -namespace FairMQ +namespace fair +{ +namespace mq { enum class Transport @@ -28,7 +29,6 @@ enum class Transport OFI }; - static std::unordered_map TransportTypes { { "default", Transport::DEFAULT }, { "zeromq", Transport::ZMQ }, @@ -37,16 +37,6 @@ static std::unordered_map TransportTypes { { "ofi", Transport::OFI } }; -} - -namespace fair -{ -namespace mq -{ - -using Transport = ::FairMQ::Transport; -using ::FairMQ::TransportTypes; - } /* namespace mq */ } /* namespace fair */ @@ -54,8 +44,24 @@ namespace std { template<> -struct hash : fair::mq::tools::HashEnum {}; +struct hash : fair::mq::tools::HashEnum {}; } /* namespace std */ +namespace fair +{ +namespace mq +{ + +static std::unordered_map TransportNames { + { Transport::DEFAULT, "default" }, + { Transport::ZMQ, "zeromq" }, + { Transport::NN, "nanomsg" }, + { Transport::SHM, "shmem" }, + { Transport::OFI, "ofi" } +}; + +} /* namespace mq */ +} /* namespace fair */ + #endif /* FAIR_MQ_TRANSPORTS_H */ diff --git a/fairmq/nanomsg/FairMQMessageNN.cxx b/fairmq/nanomsg/FairMQMessageNN.cxx index bc1a87fe..349dffef 100644 --- a/fairmq/nanomsg/FairMQMessageNN.cxx +++ b/fairmq/nanomsg/FairMQMessageNN.cxx @@ -22,7 +22,7 @@ using namespace std; -FairMQ::Transport FairMQMessageNN::fTransportType = FairMQ::Transport::NN; +fair::mq::Transport FairMQMessageNN::fTransportType = fair::mq::Transport::NN; FairMQMessageNN::FairMQMessageNN() : fMessage(nullptr) @@ -172,7 +172,7 @@ void FairMQMessageNN::SetMessage(void* data, const size_t size) fSize = size; } -FairMQ::Transport FairMQMessageNN::GetType() const +fair::mq::Transport FairMQMessageNN::GetType() const { return fTransportType; } diff --git a/fairmq/nanomsg/FairMQMessageNN.h b/fairmq/nanomsg/FairMQMessageNN.h index d2c5f57f..6c5ed4fd 100644 --- a/fairmq/nanomsg/FairMQMessageNN.h +++ b/fairmq/nanomsg/FairMQMessageNN.h @@ -46,7 +46,7 @@ class FairMQMessageNN : public FairMQMessage bool SetUsedSize(const size_t size) override; - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Copy(const FairMQMessage& msg) override; void Copy(const FairMQMessagePtr& msg) override; @@ -59,7 +59,7 @@ class FairMQMessageNN : public FairMQMessage size_t fHint; bool fReceiving; FairMQUnmanagedRegion* fRegionPtr; - static FairMQ::Transport fTransportType; + static fair::mq::Transport fTransportType; void* GetMessage() const; void CloseMessage(); diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx index 9082eb1c..c840979f 100644 --- a/fairmq/nanomsg/FairMQTransportFactoryNN.cxx +++ b/fairmq/nanomsg/FairMQTransportFactoryNN.cxx @@ -12,7 +12,7 @@ using namespace std; -FairMQ::Transport FairMQTransportFactoryNN::fTransportType = FairMQ::Transport::NN; +fair::mq::Transport FairMQTransportFactoryNN::fTransportType = fair::mq::Transport::NN; FairMQTransportFactoryNN::FairMQTransportFactoryNN(const string& id, const FairMQProgOptions* /*config*/) : FairMQTransportFactory(id) @@ -70,7 +70,7 @@ FairMQUnmanagedRegionPtr FairMQTransportFactoryNN::CreateUnmanagedRegion(const s return unique_ptr(new FairMQUnmanagedRegionNN(size, callback)); } -FairMQ::Transport FairMQTransportFactoryNN::GetType() const +fair::mq::Transport FairMQTransportFactoryNN::GetType() const { return fTransportType; } diff --git a/fairmq/nanomsg/FairMQTransportFactoryNN.h b/fairmq/nanomsg/FairMQTransportFactoryNN.h index 22eb6e24..000d1a2f 100644 --- a/fairmq/nanomsg/FairMQTransportFactoryNN.h +++ b/fairmq/nanomsg/FairMQTransportFactoryNN.h @@ -39,13 +39,13 @@ class FairMQTransportFactoryNN : public FairMQTransportFactory FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback) const override; - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Interrupt() override { FairMQSocketNN::Interrupt(); } void Resume() override { FairMQSocketNN::Resume(); } private: - static FairMQ::Transport fTransportType; + static fair::mq::Transport fTransportType; }; #endif /* FAIRMQTRANSPORTFACTORYNN_H_ */ diff --git a/fairmq/shmem/FairMQMessageSHM.cxx b/fairmq/shmem/FairMQMessageSHM.cxx index 6f9cbcd9..6ff59dc0 100644 --- a/fairmq/shmem/FairMQMessageSHM.cxx +++ b/fairmq/shmem/FairMQMessageSHM.cxx @@ -23,7 +23,7 @@ namespace bipc = boost::interprocess; namespace bpt = boost::posix_time; atomic FairMQMessageSHM::fInterrupted(false); -FairMQ::Transport FairMQMessageSHM::fTransportType = FairMQ::Transport::SHM; +fair::mq::Transport FairMQMessageSHM::fTransportType = fair::mq::Transport::SHM; FairMQMessageSHM::FairMQMessageSHM(Manager& manager) : fManager(manager) @@ -284,7 +284,7 @@ bool FairMQMessageSHM::SetUsedSize(const size_t size) } } -FairMQ::Transport FairMQMessageSHM::GetType() const +fair::mq::Transport FairMQMessageSHM::GetType() const { return fTransportType; } diff --git a/fairmq/shmem/FairMQMessageSHM.h b/fairmq/shmem/FairMQMessageSHM.h index 8fd8c0b2..07904e8b 100644 --- a/fairmq/shmem/FairMQMessageSHM.h +++ b/fairmq/shmem/FairMQMessageSHM.h @@ -44,7 +44,7 @@ class FairMQMessageSHM : public FairMQMessage bool SetUsedSize(const size_t size) override; - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Copy(const FairMQMessage& msg) override; void Copy(const FairMQMessagePtr& msg) override; @@ -57,7 +57,7 @@ class FairMQMessageSHM : public FairMQMessage bool fQueued; bool fMetaCreated; static std::atomic fInterrupted; - static FairMQ::Transport fTransportType; + static fair::mq::Transport fTransportType; size_t fRegionId; mutable fair::mq::shmem::Region* fRegionPtr; boost::interprocess::managed_shared_memory::handle_t fHandle; diff --git a/fairmq/shmem/FairMQTransportFactorySHM.cxx b/fairmq/shmem/FairMQTransportFactorySHM.cxx index 1874a367..80067d08 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.cxx +++ b/fairmq/shmem/FairMQTransportFactorySHM.cxx @@ -32,7 +32,7 @@ namespace bfs = boost::filesystem; namespace bpt = boost::posix_time; namespace bipc = boost::interprocess; -FairMQ::Transport FairMQTransportFactorySHM::fTransportType = FairMQ::Transport::SHM; +fair::mq::Transport FairMQTransportFactorySHM::fTransportType = fair::mq::Transport::SHM; FairMQTransportFactorySHM::FairMQTransportFactorySHM(const string& id, const FairMQProgOptions* config) : FairMQTransportFactory(id) @@ -316,7 +316,7 @@ FairMQTransportFactorySHM::~FairMQTransportFactorySHM() } } -FairMQ::Transport FairMQTransportFactorySHM::GetType() const +fair::mq::Transport FairMQTransportFactorySHM::GetType() const { return fTransportType; } diff --git a/fairmq/shmem/FairMQTransportFactorySHM.h b/fairmq/shmem/FairMQTransportFactorySHM.h index 71484b4a..2d092faf 100644 --- a/fairmq/shmem/FairMQTransportFactorySHM.h +++ b/fairmq/shmem/FairMQTransportFactorySHM.h @@ -47,7 +47,7 @@ class FairMQTransportFactorySHM : public FairMQTransportFactory FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback = nullptr) const override; - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Interrupt() override { FairMQSocketSHM::Interrupt(); } void Resume() override { FairMQSocketSHM::Resume(); } @@ -58,7 +58,7 @@ class FairMQTransportFactorySHM : public FairMQTransportFactory void SendHeartbeats(); void StartMonitor(); - static FairMQ::Transport fTransportType; + static fair::mq::Transport fTransportType; std::string fDeviceId; std::string fSessionName; void* fContext; diff --git a/fairmq/zeromq/FairMQMessageZMQ.cxx b/fairmq/zeromq/FairMQMessageZMQ.cxx index 7ac0619d..f782a147 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.cxx +++ b/fairmq/zeromq/FairMQMessageZMQ.cxx @@ -20,7 +20,7 @@ using namespace std; -FairMQ::Transport FairMQMessageZMQ::fTransportType = FairMQ::Transport::ZMQ; +fair::mq::Transport FairMQMessageZMQ::fTransportType = fair::mq::Transport::ZMQ; FairMQMessageZMQ::FairMQMessageZMQ() : fUsedSizeModified(false) @@ -190,7 +190,7 @@ void FairMQMessageZMQ::ApplyUsedSize() } } -FairMQ::Transport FairMQMessageZMQ::GetType() const +fair::mq::Transport FairMQMessageZMQ::GetType() const { return fTransportType; } diff --git a/fairmq/zeromq/FairMQMessageZMQ.h b/fairmq/zeromq/FairMQMessageZMQ.h index 02964338..24bcb29e 100644 --- a/fairmq/zeromq/FairMQMessageZMQ.h +++ b/fairmq/zeromq/FairMQMessageZMQ.h @@ -46,7 +46,7 @@ class FairMQMessageZMQ : public FairMQMessage bool SetUsedSize(const size_t size) override; void ApplyUsedSize(); - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Copy(const FairMQMessagePtr& msg) override; void Copy(const FairMQMessage& msg) override; @@ -58,7 +58,7 @@ class FairMQMessageZMQ : 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 FairMQ::Transport fTransportType; + 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 74cef85f..a8cd2e52 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.cxx @@ -11,7 +11,7 @@ using namespace std; -FairMQ::Transport FairMQTransportFactoryZMQ::fTransportType = FairMQ::Transport::ZMQ; +fair::mq::Transport FairMQTransportFactoryZMQ::fTransportType = fair::mq::Transport::ZMQ; FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const FairMQProgOptions* config) : FairMQTransportFactory(id) @@ -100,7 +100,7 @@ FairMQUnmanagedRegionPtr FairMQTransportFactoryZMQ::CreateUnmanagedRegion(const return unique_ptr(new FairMQUnmanagedRegionZMQ(size, callback)); } -FairMQ::Transport FairMQTransportFactoryZMQ::GetType() const +fair::mq::Transport FairMQTransportFactoryZMQ::GetType() const { return fTransportType; } diff --git a/fairmq/zeromq/FairMQTransportFactoryZMQ.h b/fairmq/zeromq/FairMQTransportFactoryZMQ.h index 8cf7559c..27638013 100644 --- a/fairmq/zeromq/FairMQTransportFactoryZMQ.h +++ b/fairmq/zeromq/FairMQTransportFactoryZMQ.h @@ -48,13 +48,13 @@ class FairMQTransportFactoryZMQ : public FairMQTransportFactory FairMQUnmanagedRegionPtr CreateUnmanagedRegion(const size_t size, FairMQRegionCallback callback) const override; - FairMQ::Transport GetType() const override; + fair::mq::Transport GetType() const override; void Interrupt() override { FairMQSocketZMQ::Interrupt(); } void Resume() override { FairMQSocketZMQ::Resume(); } private: - static FairMQ::Transport fTransportType; + static fair::mq::Transport fTransportType; void* fContext; };