Refactor and simplify c/dtors

telematics-lab · Jun 16, 2024 · 2e6308e · 2e6308e
1 parent 3e496eb
commit 2e6308e
Show file tree

Hide file tree

Showing 193 changed files with 74 additions and 1,031 deletions.
diff --git a/src/application/drone-client-application.cc b/src/application/drone-client-application.cc
@@ -77,18 +77,9 @@ DroneClientApplication::GetTypeId()
 }
 
 DroneClientApplication::DroneClientApplication()
+    : m_sequenceNumber{0},
+      m_state{CLOSED}
 {
-    NS_LOG_FUNCTION(this);
-
-    m_state = CLOSED;
-    m_sequenceNumber = 0;
-}
-
-DroneClientApplication::~DroneClientApplication()
-{
-    NS_LOG_FUNCTION(this);
-
-    m_state = CLOSED;
 }
 
 void

diff --git a/src/application/drone-client-application.h b/src/application/drone-client-application.h
@@ -75,14 +75,7 @@ class DroneClientApplication : public Application
      */
     static TypeId GetTypeId(void);
 
-    /**
-     * \brief default constructor
-     */
     DroneClientApplication();
-    /**
-     * \brief default destructor
-     */
-    virtual ~DroneClientApplication();
 
   protected:
     /**

diff --git a/src/application/drone-server-application.cc b/src/application/drone-server-application.cc
@@ -58,18 +58,9 @@ DroneServerApplication::GetTypeId()
 }
 
 DroneServerApplication::DroneServerApplication()
+    : m_state{SERVER_CLOSED},
+      m_sequenceNumber{0}
 {
-    NS_LOG_FUNCTION(this);
-
-    m_state = SERVER_CLOSED;
-    m_sequenceNumber = 0;
-}
-
-DroneServerApplication::~DroneServerApplication()
-{
-    NS_LOG_FUNCTION(this);
-
-    m_state = SERVER_CLOSED;
 }
 
 void

diff --git a/src/application/drone-server-application.h b/src/application/drone-server-application.h
@@ -37,8 +37,6 @@ class DroneServerApplication : public Application
     static TypeId GetTypeId();
 
     DroneServerApplication();
-    virtual ~DroneServerApplication();
-
   protected:
     virtual void DoDispose();
 

diff --git a/src/application/nat-application.cc b/src/application/nat-application.cc
@@ -65,12 +65,6 @@ NatApplication::GetTypeId()
 NatApplication::NatApplication()
     : m_curNatPort{1}
 {
-    NS_LOG_FUNCTION_NOARGS();
-}
-
-NatApplication::~NatApplication()
-{
-    NS_LOG_FUNCTION_NOARGS();
 }
 
 void

diff --git a/src/application/nat-application.h b/src/application/nat-application.h
@@ -39,8 +39,6 @@ class NatApplication : public Application
     // virtual void DoDispose ();
 
     NatApplication();
-    virtual ~NatApplication();
-
     bool RecvPktFromIntNetDev(Ptr<NetDevice> netdev,
                               Ptr<const Packet> pkt,
                               uint16_t protocol,

diff --git a/src/application/random-udp-application.cc b/src/application/random-udp-application.cc
@@ -75,12 +75,6 @@ RandomUdpApplication::RandomUdpApplication()
     : m_sendEvent{EventId()},
       m_seqNum{0}
 {
-    NS_LOG_FUNCTION(this);
-}
-
-RandomUdpApplication::~RandomUdpApplication()
-{
-    NS_LOG_FUNCTION(this);
 }
 
 void

diff --git a/src/application/random-udp-application.h b/src/application/random-udp-application.h
@@ -39,11 +39,6 @@ class RandomUdpApplication : public Application
      * \brief Default constructor
      */
     RandomUdpApplication();
-    /**
-     * \brief Default destructor
-     */
-    virtual ~RandomUdpApplication();
-
   protected:
     /**
      * \brief Initialize the Object registered as TypeId

diff --git a/src/application/tcp-client-server-application.cc b/src/application/tcp-client-server-application.cc
@@ -59,16 +59,6 @@ TcpClientServerApplication::GetTypeId()
     return tid;
 }
 
-TcpClientServerApplication::TcpClientServerApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
-TcpClientServerApplication::~TcpClientServerApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
 void
 TcpClientServerApplication::StartApplication()
 {

diff --git a/src/application/tcp-client-server-application.h b/src/application/tcp-client-server-application.h
@@ -32,9 +32,6 @@ class TcpClientServerApplication : public Application
 {
   public:
     static TypeId GetTypeId();
-    TcpClientServerApplication();
-    virtual ~TcpClientServerApplication();
-
   protected:
     virtual void StartApplication();
     virtual void StopApplication();

diff --git a/src/application/tcp-echo-server-application.cc b/src/application/tcp-echo-server-application.cc
@@ -47,16 +47,6 @@ TcpEchoServerApplication::GetTypeId()
     return tid;
 }
 
-TcpEchoServerApplication::TcpEchoServerApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
-TcpEchoServerApplication::~TcpEchoServerApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
 void
 TcpEchoServerApplication::StartApplication()
 {

diff --git a/src/application/tcp-echo-server-application.h b/src/application/tcp-echo-server-application.h
@@ -30,9 +30,6 @@ class TcpEchoServerApplication : public TcpClientServerApplication
 {
   public:
     static TypeId GetTypeId();
-    TcpEchoServerApplication();
-    virtual ~TcpEchoServerApplication();
-
   protected:
     virtual void StartApplication();
     virtual void ReceivedDataCallback(Ptr<Socket> s);

diff --git a/src/application/tcp-storage-client-application.cc b/src/application/tcp-storage-client-application.cc
@@ -58,12 +58,6 @@ TcpStorageClientApplication::GetTypeId()
 TcpStorageClientApplication::TcpStorageClientApplication()
     : m_seqNum{0}
 {
-    NS_LOG_FUNCTION(this);
-}
-
-TcpStorageClientApplication::~TcpStorageClientApplication()
-{
-    NS_LOG_FUNCTION(this);
 }
 
 void

diff --git a/src/application/tcp-storage-client-application.h b/src/application/tcp-storage-client-application.h
@@ -34,8 +34,6 @@ class TcpStorageClientApplication : public TcpClientServerApplication
   public:
     static TypeId GetTypeId();
     TcpStorageClientApplication();
-    virtual ~TcpStorageClientApplication();
-
   protected:
     virtual void DoInitialize();
     virtual void StartApplication();

diff --git a/src/application/tcp-stub-client-application.cc b/src/application/tcp-stub-client-application.cc
@@ -48,16 +48,6 @@ TcpStubClientApplication::GetTypeId()
     return tid;
 }
 
-TcpStubClientApplication::TcpStubClientApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
-TcpStubClientApplication::~TcpStubClientApplication()
-{
-    NS_LOG_FUNCTION(this);
-}
-
 void
 TcpStubClientApplication::DoInitialize()
 {

diff --git a/src/application/tcp-stub-client-application.h b/src/application/tcp-stub-client-application.h
@@ -35,9 +35,6 @@ class TcpStubClientApplication : public TcpStorageClientApplication
 {
   public:
     static TypeId GetTypeId();
-    TcpStubClientApplication();
-    virtual ~TcpStubClientApplication();
-
   protected:
     virtual void DoInitialize();
     virtual void StartApplication();

diff --git a/src/application/udp-echo-client-application.cc b/src/application/udp-echo-client-application.cc
@@ -62,17 +62,11 @@ UdpEchoClientApplication::GetTypeId(void)
 }
 
 UdpEchoClientApplication::UdpEchoClientApplication()
+    : m_sent{0},
+      m_totalTx{0},
+      m_socket{0},
+      m_sendEvent{EventId()}
 {
-    NS_LOG_FUNCTION(this);
-    m_sent = 0;
-    m_totalTx = 0;
-    m_socket = 0;
-    m_sendEvent = EventId();
-}
-
-UdpEchoClientApplication::~UdpEchoClientApplication()
-{
-    NS_LOG_FUNCTION(this);
 }
 
 void

diff --git a/src/application/udp-echo-client-application.h b/src/application/udp-echo-client-application.h
@@ -45,9 +45,6 @@ class UdpEchoClientApplication : public Application
     static TypeId GetTypeId(void);
 
     UdpEchoClientApplication();
-
-    virtual ~UdpEchoClientApplication();
-
     /**
      * \brief set the remote address and port
      * \param ip remote IP address

diff --git a/src/configuration/base/double-vector.cc b/src/configuration/base/double-vector.cc
@@ -26,10 +26,6 @@ namespace ns3
 
 ATTRIBUTE_HELPER_CPP(DoubleVector);
 
-DoubleVector::DoubleVector()
-{
-}
-
 DoubleVector::DoubleVector(std::vector<double> coeffs)
 {
     for (auto c : coeffs)

diff --git a/src/configuration/base/double-vector.h b/src/configuration/base/double-vector.h
@@ -37,7 +37,7 @@ class DoubleVector
   public:
     typedef std::vector<double>::const_iterator Iterator;
 
-    DoubleVector();
+    DoubleVector() = default;
     DoubleVector(std::vector<double> coefficients);
     DoubleVector(const DoubleVector& a);
 

diff --git a/src/configuration/base/int-vector.cc b/src/configuration/base/int-vector.cc
@@ -26,10 +26,6 @@ namespace ns3
 
 ATTRIBUTE_HELPER_CPP(IntVector);
 
-IntVector::IntVector()
-{
-}
-
 IntVector::IntVector(std::vector<int> coeffs)
 {
     for (auto c : coeffs)

diff --git a/src/configuration/base/int-vector.h b/src/configuration/base/int-vector.h
@@ -37,7 +37,7 @@ class IntVector
   public:
     typedef std::vector<int>::const_iterator Iterator;
 
-    IntVector();
+    IntVector() = default;
     IntVector(std::vector<int> coefficients);
     IntVector(const IntVector& a);
 

diff --git a/src/configuration/base/model-configuration-matrix.cc b/src/configuration/base/model-configuration-matrix.cc
@@ -22,10 +22,6 @@ namespace ns3
 
 ATTRIBUTE_HELPER_CPP(ModelConfigurationMatrix);
 
-ModelConfigurationMatrix::ModelConfigurationMatrix()
-{
-}
-
 ModelConfigurationMatrix::ModelConfigurationMatrix(ModelConfigurationVector conf)
     : m_confs{conf}
 {

diff --git a/src/configuration/base/model-configuration-matrix.h b/src/configuration/base/model-configuration-matrix.h
@@ -40,7 +40,7 @@ class ModelConfigurationMatrix
     typedef std::vector<ModelConfigurationVector>::iterator MutableIterator;
 
     /** Default constructor. Create an empty vector of IRS Patches. */
-    ModelConfigurationMatrix();
+    ModelConfigurationMatrix() = default;
     /**
      * Create a new ModelConfigurationMatrix with exactly one Patch which has been
      * previously istantiated. This single Patch is specified by a smart pointer.

diff --git a/src/configuration/base/model-configuration-vector.cc b/src/configuration/base/model-configuration-vector.cc
@@ -22,10 +22,6 @@ namespace ns3
 
 ATTRIBUTE_HELPER_CPP(ModelConfigurationVector);
 
-ModelConfigurationVector::ModelConfigurationVector()
-{
-}
-
 ModelConfigurationVector::ModelConfigurationVector(ModelConfiguration conf)
     : m_confs{conf}
 {

diff --git a/src/configuration/base/model-configuration-vector.h b/src/configuration/base/model-configuration-vector.h
@@ -40,7 +40,7 @@ class ModelConfigurationVector
     typedef std::vector<ModelConfiguration>::iterator MutableIterator;
 
     /** Default constructor. Create an empty vector of IRS Patches. */
-    ModelConfigurationVector();
+    ModelConfigurationVector() = default;
     /**
      * Create a new ModelConfigurationVector with exactly one Patch which has been
      * previously istantiated. This single Patch is specified by a smart pointer.

diff --git a/src/configuration/base/model-configuration.h b/src/configuration/base/model-configuration.h
@@ -38,8 +38,7 @@ class ModelConfiguration
         std::string name;
         Ptr<AttributeValue> value;
 
-        Attribute() = default;
-
+	Attribute() = default;
         Attribute(std::string name, Ptr<AttributeValue> value)
             : name{name},
               value{value}
@@ -73,7 +72,6 @@ class ModelConfiguration
                        const AttributeVector attributes,
                        const ModelConfigurationVector aggregates);
 
-    /** Default destructor */
     ~ModelConfiguration();
 
     /**

diff --git a/src/configuration/base/str-vec.cc b/src/configuration/base/str-vec.cc
@@ -26,10 +26,6 @@ namespace ns3
 
 ATTRIBUTE_HELPER_CPP(StrVec);
 
-StrVec::StrVec()
-{
-}
-
 StrVec::StrVec(std::vector<std::string> strs)
 {
     for (auto s : strs)

diff --git a/src/configuration/base/str-vec.h b/src/configuration/base/str-vec.h
@@ -37,7 +37,7 @@ class StrVec
   public:
     typedef std::vector<std::string>::const_iterator Iterator;
 
-    StrVec();
+    StrVec() = default;
     StrVec(std::vector<std::string> coefficients);
     StrVec(const StrVec& a);
 

diff --git a/src/configuration/base/vector.h b/src/configuration/base/vector.h
@@ -30,8 +30,6 @@ namespace ns3
 #include <typeinfo>
 #include <vector>
 
-// #include <typetraits>
-
 /**
  * Output streamer for std::vector<T>
  * \tparam T type of the vector elements
@@ -88,9 +86,9 @@ class VectorValue : public AttributeValue
 
 class VectorChecker : public AttributeChecker
 {
-  public:
-    virtual void SetChecker(Ptr<const AttributeChecker> checker) = 0;
-    virtual Ptr<const AttributeChecker> GetChecker(void) const = 0;
+public:
+  virtual void SetChecker(Ptr<const AttributeChecker> checker) = 0;
+  virtual Ptr<const AttributeChecker> GetChecker(void) const = 0;
 };
 
 /**

diff --git a/src/configuration/entity-configuration.cc b/src/configuration/entity-configuration.cc
@@ -57,10 +57,6 @@ EntityConfiguration::EntityConfiguration(std::vector<Ptr<NetdeviceConfiguration>
 {
 }
 
-EntityConfiguration::~EntityConfiguration()
-{
-}
-
 const std::vector<Ptr<NetdeviceConfiguration>>&
 EntityConfiguration::GetNetDevices() const
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     }
-    EntityConfiguration::~EntityConfiguration()
-    {
-    }
     const std::vector<Ptr<NetdeviceConfiguration>>&
     EntityConfiguration::GetNetDevices() const
     {
@@ Expand Down @@