TMP - MOVE DATA MEMBERS TO TOP

Author: avarga

src/simu5g/background/cell/BackgroundScheduler.h

@@ -82,17 +82,18 @@ class BackgroundScheduler : public cSimpleModule, public cListener
     std::vector<MacNodeId> ulBandAllocation_;
     std::vector<MacNodeId> ulPrevBandAllocation_;
 
+    // statistics
+    static simsignal_t bgAvgServedBlocksDlSignal_;
+    static simsignal_t bgAvgServedBlocksUlSignal_;
+
     // update the band status. Called at each TTI (not used for FULL_ALLOC)
     virtual void updateAllocation(Direction dir);
     // move the current status in the prevBandStatus structure and reset the former
     void resetAllocation(Direction dir);
     /*****************************/
 
-    // statistics
-    static simsignal_t bgAvgServedBlocksDlSignal_;
-    static simsignal_t bgAvgServedBlocksUlSignal_;
-
   protected:
+
     void initialize(int stage) override;
     int numInitStages() const override { return inet::INITSTAGE_LOCAL + 2; }
     void handleMessage(cMessage *msg) override;

src/simu5g/background/trafficGenerator/BackgroundTrafficManagerBase.h

@@ -83,11 +83,14 @@ class BackgroundTrafficManagerBase : public cSimpleModule, public IBackgroundTra
 
     /*************************************/
 
+    static const double nrCqiTable[16];
+
+  protected:
+
     void initialize(int stage) override;
     int numInitStages() const override { return inet::INITSTAGE_LAST; }
     void handleMessage(cMessage *msg) override;
 
-    static const double nrCqiTable[16];
     static double getCqiFromTable(double snr);
 
     virtual double getTtiPeriod() = 0;

src/simu5g/corenetwork/gtp/GtpUser.h

@@ -53,15 +53,15 @@ class GtpUser : public cSimpleModule
     // specifies the type of the node that contains this filter (it can be ENB or PGW)
     CoreNodeType ownerType_;
 
-    CoreNodeType selectOwnerType(const char *type);
-
     // if this module is on BS, this variable includes the ID of the BS
     MacNodeId myMacNodeID;
 
     opp_component_ptr<inet::NetworkInterface> ie_;
 
     opp_component_ptr<cModule> networkNode_;
 
+    CoreNodeType selectOwnerType(const char *type);
+
   protected:
 
     int numInitStages() const override { return inet::NUM_INIT_STAGES; }
@@ -81,4 +81,3 @@ class GtpUser : public cSimpleModule
 } //namespace
 
 #endif
-

src/simu5g/corenetwork/trafficFlowFilter/TrafficFlowFilter.h

@@ -48,8 +48,6 @@ class TrafficFlowFilter : public cSimpleModule
     // store the name of the gateway node (for MEC Hosts and base stations only)
     std::string gateway_;
 
-    CoreNodeType selectOwnerType(const char *type);
-
     // === MEC support === //
 
     // only if owner type is ENB or GNB
@@ -64,6 +62,8 @@ class TrafficFlowFilter : public cSimpleModule
     inet::L3Address meAppsExtAddress_;
     int meAppsExtAddressMask_;
 
+    CoreNodeType selectOwnerType(const char *type);
+
   protected:
     int numInitStages() const override { return inet::INITSTAGE_LAST + 1; }
     void initialize(int stage) override;
@@ -78,4 +78,3 @@ class TrafficFlowFilter : public cSimpleModule
 } //namespace
 
 #endif
-

src/simu5g/mec/platform/services/messages/HttpRequestMessage.h

@@ -65,15 +65,15 @@ class HttpRequestMessage : public HttpRequestMessage_m
     virtual std::string getPayload() const;
 
   private:
-    void copy(const HttpRequestMessage& other);
     std::map<std::string, std::string> headerFields_;
 
     bool isBackgroundRequest_;
     bool isLastBackgroundRequest_;
 
+    void copy(const HttpRequestMessage& other);
+
 };
 
 } //namespace
 
 #endif //_HTTREQUESTMESSAGE_H_
-

src/simu5g/mec/platform/services/messages/HttpResponseMessage.h

@@ -57,12 +57,12 @@ class HttpResponseMessage : public HttpResponseMessage_m
     virtual std::string getPayload() const;
 
   private:
-    void copy(const HttpResponseMessage& other);
     std::map<std::string, std::string> headerFields_;
 
+    void copy(const HttpResponseMessage& other);
+
 };
 
 } //namespace
 
 #endif //_HTTRESPONSEMESSAGE_H_
-

src/simu5g/stack/ip2nic/Ip2Nic.h

@@ -78,6 +78,12 @@ class Ip2Nic : public cSimpleModule
     SplitBearersTable *sbTable_ = nullptr;
 
   protected:
+    cGate *stackGateOut_ = nullptr;       // gate connecting Ip2Nic module to cellular stack
+    cGate *ipGateOut_ = nullptr;          // gate connecting Ip2Nic module to network layer
+
+    // corresponding entry for our interface
+    opp_component_ptr<inet::NetworkInterface> networkIf;
+
     /**
      * Handle packets from transport layer and forward them to the stack
      */
@@ -128,12 +134,6 @@ class Ip2Nic : public cSimpleModule
     void handleMessage(cMessage *msg) override;
     void finish() override;
 
-    cGate *stackGateOut_ = nullptr;       // gate connecting Ip2Nic module to cellular stack
-    cGate *ipGateOut_ = nullptr;          // gate connecting Ip2Nic module to network layer
-
-    // corresponding entry for our interface
-    opp_component_ptr<inet::NetworkInterface> networkIf;
-
   public:
 
     /*
@@ -158,4 +158,3 @@ class Ip2Nic : public cSimpleModule
 } //namespace
 
 #endif
-

src/simu5g/stack/ip2nic/SplitBearersTable.h

@@ -51,13 +51,6 @@ class SplitBearersTable
     int create_entry(uint32_t srcAddr, uint32_t dstAddr, uint16_t typeOfService);
 
   private:
-    /**
-     * hash_func() calculates the hash function used
-     * by this structure. At the moment it's simply an OR
-     * operation between all fields of the 3-tuple
-     */
-    unsigned int hash_func(uint32_t srcAddr, uint32_t dstAddr, uint16_t typeOfService);
-
     /*
      * Data Structures
      */
@@ -85,9 +78,15 @@ class SplitBearersTable
 
     /// Hash table of size TABLE_SIZE
     entry_ ht_[TABLE_SIZE];
+
+    /**
+     * hash_func() calculates the hash function used
+     * by this structure. At the moment it's simply an OR
+     * operation between all fields of the 3-tuple
+     */
+    unsigned int hash_func(uint32_t srcAddr, uint32_t dstAddr, uint16_t typeOfService);
 };
 
 } //namespace
 
 #endif
-

src/simu5g/stack/mac/LteMacBase.h

@@ -163,9 +163,6 @@ class LteMacBase : public cSimpleModule
     };
     std::map<NumerologyIndex, NumerologyPeriodCounter> numerologyPeriodCounter_;
 
-    unsigned int getNumerologyPeriodCounter(NumerologyIndex index) { return numerologyPeriodCounter_[index].current; }
-    void decreaseNumerologyPeriodCounter();
-
     // statistics in visualization
     bool statDisplay_;
     uint64_t nrFromUpper_;
@@ -179,6 +176,11 @@ class LteMacBase : public cSimpleModule
     unsigned int totalHarqErrorRateDlCount_ = 0;
     unsigned int totalHarqErrorRateUlCount_ = 0;
 
+  protected:
+
+    unsigned int getNumerologyPeriodCounter(NumerologyIndex index) { return numerologyPeriodCounter_[index].current; }
+    void decreaseNumerologyPeriodCounter();
+
   public:
 
     /**

src/simu5g/stack/mac/scheduler/LteSchedulerEnbUl.h

@@ -32,6 +32,14 @@ class LteSchedulerEnbUl : public LteSchedulerEnb
     unsigned int scheduleUnit_;
     //---------------------------------------------
 
+    //! Uplink Synchronous H-ARQ process counter - keeps track of currently active process on connected UEs.
+    std::map<GHz, HarqStatus> harqStatus_;
+
+    //! RAC request flags: signals whether a UE shall be granted the RAC allocation
+    std::map<GHz, RacStatus> racStatus_;
+
+  protected:
+
     /**
      * Checks Harq Descriptors and returns the first free codeword.
      *
@@ -41,12 +49,6 @@ class LteSchedulerEnbUl : public LteSchedulerEnb
      */
     bool checkEligibility(MacNodeId id, Codeword& cw, GHz carrierFrequency) override;
 
-    //! Uplink Synchronous H-ARQ process counter - keeps track of currently active process on connected UEs.
-    std::map<GHz, HarqStatus> harqStatus_;
-
-    //! RAC request flags: signals whether a UE shall be granted the RAC allocation
-    std::map<GHz, RacStatus> racStatus_;
-
   public:
 
     //! Updates HARQ descriptor current process pointer (to be called every TTI by main loop).
@@ -110,4 +112,3 @@ class LteSchedulerEnbUl : public LteSchedulerEnb
 } //namespace
 
 #endif // _LTE_LTE_SCHEDULER_ENB_UL_H_
-