PacketFlowManager: public->protected change for methods only used internally

This makes its public API smaller and more transparent.

Author: avarga

src/simu5g/stack/packetFlowManager/PacketFlowManagerBase.h

@@ -72,11 +72,10 @@ class PacketFlowManagerBase : public cSimpleModule
 
     int headerCompressedSize_;
 
+  protected:
     int numInitStages() const override { return 2; }
     void initialize(int stage) override;
-
-  public:
-
+    void finish() override;
 
     // return true if a structure for this lcid is present
     virtual bool hasLcid(LogicalCid lcid) = 0;
@@ -96,6 +95,7 @@ class PacketFlowManagerBase : public cSimpleModule
     // reset structures for all connections
     virtual void clearAllLcid() = 0;
 
+  public:
     /*
      * This method inserts a new pdcp seqnum and the corresponding entry time
      * @param lcid
@@ -112,7 +112,6 @@ class PacketFlowManagerBase : public cSimpleModule
      * @param lcid
      * @param rlcPdu packet pointer
      */
-
     virtual void insertRlcPdu(LogicalCid lcid, const inet::Ptr<LteRlcUmDataPdu> rlcPdu, RlcBurstStatus status) = 0;
 
     /*
@@ -152,8 +151,6 @@ class PacketFlowManagerBase : public cSimpleModule
     virtual void grantSent(MacNodeId nodeId, unsigned int grantId) {}
 
     virtual void resetDiscardCounter();
-
-    void finish() override;
 };
 
 } //namespace

src/simu5g/stack/packetFlowManager/PacketFlowManagerEnb.h

@@ -119,6 +119,10 @@ class PacketFlowManagerEnb : public PacketFlowManagerBase
     // used to evaluate the delay with respect to the one reported by Simu5G
     cOutVector timesUe_;
 
+  protected:
+    void initialize(int stage) override;
+    void finish() override;
+
     /*
      * This method checks if a PDCP PDU of a LCID is part of a burst of data.
      * In a positive case, according to the ack boolean its size is counted in the
@@ -135,9 +139,6 @@ class PacketFlowManagerEnb : public PacketFlowManagerBase
      */
     void initPdcpStatus(StatusDescriptor *desc, unsigned int pdcp, unsigned int sduHeaderSize, simtime_t& arrivalTime);
 
-    void initialize(int stage) override;
-
-  public:
     // return true if a structure for this LCID is present
     bool hasLcid(LogicalCid lcid) override;
     // initialize a new structure for this LCID
@@ -147,6 +148,7 @@ class PacketFlowManagerEnb : public PacketFlowManagerBase
     // reset structures for all connections
     void clearAllLcid() override;
 
+  public:
     void insertPdcpSdu(inet::Packet *pdcpPkt) override;
     void receivedPdcpSdu(inet::Packet *pdcpPkt) override;
 
@@ -215,7 +217,6 @@ class PacketFlowManagerEnb : public PacketFlowManagerBase
 
     virtual double getThroughputStatsPerUe(MacNodeId id);
     virtual void resetThroughputCounterPerUe(MacNodeId id);
-    void finish() override;
 };
 
 } //namespace

src/simu5g/stack/packetFlowManager/PacketFlowManagerUe.h

@@ -71,9 +71,10 @@ class PacketFlowManagerUe : public PacketFlowManagerBase
   protected:
 
     void initialize(int stage) override;
+    void finish() override;
+
     void initPdcpStatus(StatusDescriptor *desc, unsigned int pdcp, unsigned int sduHeaderSize, simtime_t& arrivalTime);
 
-  public:
     // return true if a structure for this LCID is present
     bool hasLcid(LogicalCid lcid) override;
     // initialize a new structure for this LCID
@@ -82,8 +83,8 @@ class PacketFlowManagerUe : public PacketFlowManagerBase
     void clearLcid(LogicalCid lcid) override;
     // reset structures for all connections
     void clearAllLcid() override;
-    virtual void clearStats();
 
+  public:
     void insertPdcpSdu(inet::Packet *pdcpPkt) override;
 
     void receivedPdcpSdu(inet::Packet *pdcpPkt) override { /*TODO*/ }
@@ -136,8 +137,6 @@ class PacketFlowManagerUe : public PacketFlowManagerBase
     double getDelayStats();
     void resetDelayCounter();
 
-    void finish() override;
-
 };
 
 } //namespace