Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-16 18:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix namespaces in Transports.h and add conversion map

Browse Source
This commit is contained in:
Alexey Rybalchenko
2018-05-04 14:58:14 +02:00
committed by Mohammad Al-Turany
parent 155618af57
commit 7a4fd96b27
19 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/shmem/FairMQMessageSHM.cxx
View File

@@ -23,7 +23,7 @@ namespace bipc = boost::interprocess;
namespace bpt = boost::posix_time;
atomic<bool> 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;
}

4
fairmq/shmem/FairMQMessageSHM.h
View File

@@ -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<bool> 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;

4
fairmq/shmem/FairMQTransportFactorySHM.cxx
View File

@@ -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;
}

4
fairmq/shmem/FairMQTransportFactorySHM.h
View File

@@ -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;