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

FairMQChannel: remove artifacts from no longer used optimizations

Browse Source
This commit is contained in:
Alexey Rybalchenko 2020-09-22 10:03:56 +02:00 committed by Dennis Klein
parent e332e20dbd
commit cfa18ccfce
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fairmq/FairMQChannel.cxx
View File

@ -83,8 +83,6 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, const strin
, fAutoBind(DefaultAutoBind) , fAutoBind(DefaultAutoBind)
, fIsValid(false) , fIsValid(false)
, fMultipart(false) , fMultipart(false)
, fModified(true)
, fReset(false)
{} {}
FairMQChannel::FairMQChannel(const string& name, int index, const fair::mq::Properties& properties) FairMQChannel::FairMQChannel(const string& name, int index, const fair::mq::Properties& properties)
@ -130,8 +128,6 @@ FairMQChannel::FairMQChannel(const FairMQChannel& chan, const string& newName)
, fAutoBind(chan.fAutoBind) , fAutoBind(chan.fAutoBind)
, fIsValid(false) , fIsValid(false)
, fMultipart(chan.fMultipart) , fMultipart(chan.fMultipart)
, fModified(chan.fModified)
, fReset(false)
{} {}
FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan) FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
@ -158,8 +154,6 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
fAutoBind = chan.fAutoBind; fAutoBind = chan.fAutoBind;
fIsValid = false; fIsValid = false;
fMultipart = chan.fMultipart; fMultipart = chan.fMultipart;
fModified = chan.fModified;
fReset = false;
return *this; return *this;
} }
@ -264,103 +258,84 @@ void FairMQChannel::UpdateType(const string& type)
{ {
fIsValid = false; fIsValid = false;
fType = type; fType = type;
fModified = true;
} }
void FairMQChannel::UpdateMethod(const string& method) void FairMQChannel::UpdateMethod(const string& method)
{ {
fIsValid = false; fIsValid = false;
fMethod = method; fMethod = method;
fModified = true;
} }
void FairMQChannel::UpdateAddress(const string& address) void FairMQChannel::UpdateAddress(const string& address)
{ {
fIsValid = false; fIsValid = false;
fAddress = address; fAddress = address;
fModified = true;
} }
void FairMQChannel::UpdateTransport(const string& transport) void FairMQChannel::UpdateTransport(const string& transport)
{ {
fIsValid = false; fIsValid = false;
fTransportType = TransportTypes.at(transport); fTransportType = TransportTypes.at(transport);
fModified = true;
} }
void FairMQChannel::UpdateSndBufSize(const int sndBufSize) void FairMQChannel::UpdateSndBufSize(const int sndBufSize)
{ {
fIsValid = false; fIsValid = false;
fSndBufSize = sndBufSize; fSndBufSize = sndBufSize;
fModified = true;
} }
void FairMQChannel::UpdateRcvBufSize(const int rcvBufSize) void FairMQChannel::UpdateRcvBufSize(const int rcvBufSize)
{ {
fIsValid = false; fIsValid = false;
fRcvBufSize = rcvBufSize; fRcvBufSize = rcvBufSize;
fModified = true;
} }
void FairMQChannel::UpdateSndKernelSize(const int sndKernelSize) void FairMQChannel::UpdateSndKernelSize(const int sndKernelSize)
{ {
fIsValid = false; fIsValid = false;
fSndKernelSize = sndKernelSize; fSndKernelSize = sndKernelSize;
fModified = true;
} }
void FairMQChannel::UpdateRcvKernelSize(const int rcvKernelSize) void FairMQChannel::UpdateRcvKernelSize(const int rcvKernelSize)
{ {
fIsValid = false; fIsValid = false;
fRcvKernelSize = rcvKernelSize; fRcvKernelSize = rcvKernelSize;
fModified = true;
} }
void FairMQChannel::UpdateLinger(const int duration) void FairMQChannel::UpdateLinger(const int duration)
{ {
fIsValid = false; fIsValid = false;
fLinger = duration; fLinger = duration;
fModified = true;
} }
void FairMQChannel::UpdateRateLogging(const int rateLogging) void FairMQChannel::UpdateRateLogging(const int rateLogging)
{ {
fIsValid = false; fIsValid = false;
fRateLogging = rateLogging; fRateLogging = rateLogging;
fModified = true;
} }
void FairMQChannel::UpdatePortRangeMin(const int minPort) void FairMQChannel::UpdatePortRangeMin(const int minPort)
{ {
fIsValid = false; fIsValid = false;
fPortRangeMin = minPort; fPortRangeMin = minPort;
fModified = true;
} }
void FairMQChannel::UpdatePortRangeMax(const int maxPort) void FairMQChannel::UpdatePortRangeMax(const int maxPort)
{ {
fIsValid = false; fIsValid = false;
fPortRangeMax = maxPort; fPortRangeMax = maxPort;
fModified = true;
} }
void FairMQChannel::UpdateAutoBind(const bool autobind) void FairMQChannel::UpdateAutoBind(const bool autobind)
{ {
fIsValid = false; fIsValid = false;
fAutoBind = autobind; fAutoBind = autobind;
fModified = true;
}
auto FairMQChannel::SetModified(const bool modified) -> void
{
fModified = modified;
} }
void FairMQChannel::UpdateName(const string& name) void FairMQChannel::UpdateName(const string& name)
{ {
fIsValid = false; fIsValid = false;
fName = name; fName = name;
fModified = true;
} }
bool FairMQChannel::IsValid() const bool FairMQChannel::IsValid() const

4
fairmq/FairMQChannel.h
View File

@ -372,8 +372,6 @@ class FairMQChannel
bool fIsValid; bool fIsValid;
bool fMultipart; bool fMultipart;
bool fModified;
bool fReset;
void CheckSendCompatibility(FairMQMessagePtr& msg) void CheckSendCompatibility(FairMQMessagePtr& msg)
{ {
@ -430,8 +428,6 @@ class FairMQChannel
fTransportFactory = factory; fTransportFactory = factory;
fTransportType = factory->GetType(); fTransportType = factory->GetType();
} }
auto SetModified(const bool modified) -> void;
}; };
#endif /* FAIRMQCHANNEL_H_ */ #endif /* FAIRMQCHANNEL_H_ */

1
fairmq/FairMQDevice.cxx
View File

@ -390,7 +390,6 @@ void FairMQDevice::AttachChannels(vector<FairMQChannel*>& chans)
if ((*itr)->Validate()) { if ((*itr)->Validate()) {
(*itr)->Init(); (*itr)->Init();
if (AttachChannel(**itr)) { if (AttachChannel(**itr)) {
(*itr)->SetModified(false);
// remove the channel from the uninitialized container // remove the channel from the uninitialized container
itr = chans.erase(itr); itr = chans.erase(itr);
} else { } else {