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

Remove useless members

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-05-15 22:20:14 +02:00
parent f4a54ff550
commit 7a67719a3c
8 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/shmem/Message.cxx
View File

@ -29,8 +29,6 @@ namespace mq
namespace shmem namespace shmem
{ {
Transport Message::fTransportType = Transport::SHM;
Message::Message(Manager& manager, FairMQTransportFactory* factory) Message::Message(Manager& manager, FairMQTransportFactory* factory)
: fair::mq::Message{factory} : fair::mq::Message{factory}
, fManager(manager) , fManager(manager)

4
fairmq/shmem/Message.h
View File

@ -52,7 +52,7 @@ class Message final : public fair::mq::Message
bool SetUsedSize(const size_t size) override; 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; void Copy(const fair::mq::Message& msg) override;
@ -65,8 +65,6 @@ class Message final : public fair::mq::Message
mutable Region* fRegionPtr; mutable Region* fRegionPtr;
mutable char* fLocalPtr; mutable char* fLocalPtr;
static Transport fTransportType;
bool InitializeChunk(const size_t size); bool InitializeChunk(const size_t size);
void CloseMessage(); void CloseMessage();
}; };

7
fairmq/shmem/TransportFactory.cxx
View File

@ -37,8 +37,6 @@ namespace mq
namespace shmem namespace shmem
{ {
Transport TransportFactory::fTransportType = Transport::SHM;
TransportFactory::TransportFactory(const string& id, const ProgOptions* config) TransportFactory::TransportFactory(const string& id, const ProgOptions* config)
: fair::mq::TransportFactory(id) : fair::mq::TransportFactory(id)
, fDeviceId(id) , fDeviceId(id)
@ -199,11 +197,6 @@ vector<fair::mq::RegionInfo> TransportFactory::GetRegionInfo()
return fManager->GetRegionInfo(); return fManager->GetRegionInfo();
} }
Transport TransportFactory::GetType() const
{
return fTransportType;
}
void TransportFactory::Reset() void TransportFactory::Reset()
{ {
if (fMsgCounter.load() != 0) { if (fMsgCounter.load() != 0) {

3
fairmq/shmem/TransportFactory.h
View File

@ -59,7 +59,7 @@ class TransportFactory final : public fair::mq::TransportFactory
void UnsubscribeFromRegionEvents() override; void UnsubscribeFromRegionEvents() override;
std::vector<fair::mq::RegionInfo> GetRegionInfo() override; std::vector<fair::mq::RegionInfo> GetRegionInfo() override;
Transport GetType() const override; Transport GetType() const override { return fair::mq::Transport::SHM; }
void Interrupt() override { fManager->Interrupt(); } void Interrupt() override { fManager->Interrupt(); }
void Resume() override { fManager->Resume(); } void Resume() override { fManager->Resume(); }
@ -73,7 +73,6 @@ class TransportFactory final : public fair::mq::TransportFactory
private: private:
void SendHeartbeats(); void SendHeartbeats();
static Transport fTransportType;
std::string fDeviceId; std::string fDeviceId;
std::string fShmId; std::string fShmId;
void* fZMQContext; void* fZMQContext;

7
fairmq/zeromq/FairMQMessageZMQ.cxx
View File

@ -23,8 +23,6 @@
using namespace std; using namespace std;
fair::mq::Transport FairMQMessageZMQ::fTransportType = fair::mq::Transport::ZMQ;
FairMQMessageZMQ::FairMQMessageZMQ(FairMQTransportFactory* factory) FairMQMessageZMQ::FairMQMessageZMQ(FairMQTransportFactory* factory)
: FairMQMessage{factory} : FairMQMessage{factory}
, fUsedSizeModified(false) , fUsedSizeModified(false)
@ -202,11 +200,6 @@ void FairMQMessageZMQ::ApplyUsedSize()
} }
} }
fair::mq::Transport FairMQMessageZMQ::GetType() const
{
return fTransportType;
}
void FairMQMessageZMQ::Copy(const FairMQMessage& msg) void FairMQMessageZMQ::Copy(const FairMQMessage& msg)
{ {
const FairMQMessageZMQ& zMsg = static_cast<const FairMQMessageZMQ&>(msg); const FairMQMessageZMQ& zMsg = static_cast<const FairMQMessageZMQ&>(msg);

3
fairmq/zeromq/FairMQMessageZMQ.h
View File

@ -47,7 +47,7 @@ class FairMQMessageZMQ final : public FairMQMessage
bool SetUsedSize(const size_t size) override; bool SetUsedSize(const size_t size) override;
void ApplyUsedSize(); 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; void Copy(const FairMQMessage& msg) override;
@ -58,7 +58,6 @@ class FairMQMessageZMQ final : public FairMQMessage
size_t fUsedSize; size_t fUsedSize;
std::unique_ptr<zmq_msg_t> fMsg; std::unique_ptr<zmq_msg_t> fMsg;
std::unique_ptr<zmq_msg_t> fViewMsg; // view on a subset of fMsg (treating it as user buffer) std::unique_ptr<zmq_msg_t> fViewMsg; // view on a subset of fMsg (treating it as user buffer)
static fair::mq::Transport fTransportType;
zmq_msg_t* GetMessage() const; zmq_msg_t* GetMessage() const;
void CloseMessage(); void CloseMessage();

7
fairmq/zeromq/FairMQTransportFactoryZMQ.cxx
View File

@ -13,8 +13,6 @@
using namespace std; using namespace std;
fair::mq::Transport FairMQTransportFactoryZMQ::fTransportType = fair::mq::Transport::ZMQ;
FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const fair::mq::ProgOptions* config) FairMQTransportFactoryZMQ::FairMQTransportFactoryZMQ(const string& id, const fair::mq::ProgOptions* config)
: FairMQTransportFactory(id) : FairMQTransportFactory(id)
, fContext(zmq_ctx_new()) , fContext(zmq_ctx_new())
@ -224,11 +222,6 @@ void FairMQTransportFactoryZMQ::RemoveRegion(uint64_t id)
fRegionEventsCV.notify_one(); fRegionEventsCV.notify_one();
} }
fair::mq::Transport FairMQTransportFactoryZMQ::GetType() const
{
return fTransportType;
}
FairMQTransportFactoryZMQ::~FairMQTransportFactoryZMQ() FairMQTransportFactoryZMQ::~FairMQTransportFactoryZMQ()
{ {
LOG(debug) << "Destroying ZeroMQ transport..."; LOG(debug) << "Destroying ZeroMQ transport...";

3
fairmq/zeromq/FairMQTransportFactoryZMQ.h
View File

@ -61,7 +61,7 @@ class FairMQTransportFactoryZMQ final : public FairMQTransportFactory
std::vector<fair::mq::RegionInfo> GetRegionInfo() override; std::vector<fair::mq::RegionInfo> GetRegionInfo() override;
void RemoveRegion(uint64_t id); 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 Interrupt() override { FairMQSocketZMQ::Interrupt(); }
void Resume() override { FairMQSocketZMQ::Resume(); } void Resume() override { FairMQSocketZMQ::Resume(); }
@ -70,7 +70,6 @@ class FairMQTransportFactoryZMQ final : public FairMQTransportFactory
~FairMQTransportFactoryZMQ() override; ~FairMQTransportFactoryZMQ() override;
private: private:
static fair::mq::Transport fTransportType;
void* fContext; void* fContext;
std::mutex fMtx; std::mutex fMtx;