From cfa18ccfcef763ef4f35d785aa59cc62dfe91630 Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Tue, 22 Sep 2020 10:03:56 +0200
Subject: [PATCH] FairMQChannel: remove artifacts from no longer used
 optimizations

---
 fairmq/FairMQChannel.cxx | 25 -------------------------
 fairmq/FairMQChannel.h   |  4 ----
 fairmq/FairMQDevice.cxx  |  1 -
 3 files changed, 30 deletions(-)

diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx
index d62c5785..54a146b9 100644
--- a/fairmq/FairMQChannel.cxx
+++ b/fairmq/FairMQChannel.cxx
@@ -83,8 +83,6 @@ FairMQChannel::FairMQChannel(const string& name, const string& type, const strin
     , fAutoBind(DefaultAutoBind)
     , fIsValid(false)
     , fMultipart(false)
-    , fModified(true)
-    , fReset(false)
 {}
 
 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)
     , fIsValid(false)
     , fMultipart(chan.fMultipart)
-    , fModified(chan.fModified)
-    , fReset(false)
 {}
 
 FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
@@ -158,8 +154,6 @@ FairMQChannel& FairMQChannel::operator=(const FairMQChannel& chan)
     fAutoBind = chan.fAutoBind;
     fIsValid = false;
     fMultipart = chan.fMultipart;
-    fModified = chan.fModified;
-    fReset = false;
 
     return *this;
 }
@@ -264,103 +258,84 @@ void FairMQChannel::UpdateType(const string& type)
 {
     fIsValid = false;
     fType = type;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateMethod(const string& method)
 {
     fIsValid = false;
     fMethod = method;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateAddress(const string& address)
 {
     fIsValid = false;
     fAddress = address;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateTransport(const string& transport)
 {
     fIsValid = false;
     fTransportType = TransportTypes.at(transport);
-    fModified = true;
 }
 
 void FairMQChannel::UpdateSndBufSize(const int sndBufSize)
 {
     fIsValid = false;
     fSndBufSize = sndBufSize;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateRcvBufSize(const int rcvBufSize)
 {
     fIsValid = false;
     fRcvBufSize = rcvBufSize;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateSndKernelSize(const int sndKernelSize)
 {
     fIsValid = false;
     fSndKernelSize = sndKernelSize;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateRcvKernelSize(const int rcvKernelSize)
 {
     fIsValid = false;
     fRcvKernelSize = rcvKernelSize;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateLinger(const int duration)
 {
     fIsValid = false;
     fLinger = duration;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateRateLogging(const int rateLogging)
 {
     fIsValid = false;
     fRateLogging = rateLogging;
-    fModified = true;
 }
 
 void FairMQChannel::UpdatePortRangeMin(const int minPort)
 {
     fIsValid = false;
     fPortRangeMin = minPort;
-    fModified = true;
 }
 
 void FairMQChannel::UpdatePortRangeMax(const int maxPort)
 {
     fIsValid = false;
     fPortRangeMax = maxPort;
-    fModified = true;
 }
 
 void FairMQChannel::UpdateAutoBind(const bool autobind)
 {
     fIsValid = false;
     fAutoBind = autobind;
-    fModified = true;
-}
-
-auto FairMQChannel::SetModified(const bool modified) -> void
-{
-    fModified = modified;
 }
 
 void FairMQChannel::UpdateName(const string& name)
 {
     fIsValid = false;
     fName = name;
-    fModified = true;
 }
 
 bool FairMQChannel::IsValid() const
diff --git a/fairmq/FairMQChannel.h b/fairmq/FairMQChannel.h
index 443b6dc9..d0b1379f 100644
--- a/fairmq/FairMQChannel.h
+++ b/fairmq/FairMQChannel.h
@@ -372,8 +372,6 @@ class FairMQChannel
     bool fIsValid;
 
     bool fMultipart;
-    bool fModified;
-    bool fReset;
 
     void CheckSendCompatibility(FairMQMessagePtr& msg)
     {
@@ -430,8 +428,6 @@ class FairMQChannel
         fTransportFactory = factory;
         fTransportType = factory->GetType();
     }
-
-    auto SetModified(const bool modified) -> void;
 };
 
 #endif /* FAIRMQCHANNEL_H_ */
diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index c3fe73c2..d5599b39 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -390,7 +390,6 @@ void FairMQDevice::AttachChannels(vector<FairMQChannel*>& chans)
         if ((*itr)->Validate()) {
             (*itr)->Init();
             if (AttachChannel(**itr)) {
-                (*itr)->SetModified(false);
                 // remove the channel from the uninitialized container
                 itr = chans.erase(itr);
             } else {