LteControlInfo: moved entirely into msg file

Author: avarga

src/simu5g/common/LteControlInfo.cc

@@ -12,102 +12,7 @@
 #ifndef _LTE_LTECONTROLINFO_H_
 #define _LTE_LTECONTROLINFO_H_
 
-#include "simu5g/common/LteCommon.h"
 #include "simu5g/common/LteControlInfo_m.h"
-#include <vector>
-
-namespace simu5g {
-
-class UserTxParams;
-
-/**
- * @class UserControlInfo
- * @brief ControlInfo used in the Lte model
- *
- * This is the LteControlInfo Resource Block Vector
- * and Remote Antennas Set
- *
- */
-class UserControlInfo : public UserControlInfo_Base
-{
-  protected:
-
-    const UserTxParams *userTxParams = nullptr;
-    RbMap grantedBlocks;
-    /** @brief The movement of the sending host.*/
-    //Move senderMovement;
-    /** @brief The playground position of the sending host.*/
-    inet::Coord senderCoord;
-
-  public:
-
-    /**
-     * Constructor: base initialization
-     * @param name packet name
-     * @param kind packet kind
-     */
-    UserControlInfo();
-    ~UserControlInfo() override;
-
-    /*
-     * Operator = : packet copy
-     * @param other source packet
-     * @return reference to this packet
-     */
-    UserControlInfo& operator=(const UserControlInfo& other);
-
-    /**
-     * Copy constructor: packet copy
-     * @param other source packet
-     */
-    UserControlInfo(const UserControlInfo& other) :
-        UserControlInfo_Base()
-    {
-        operator=(other);
-    }
-
-    /**
-     * dup() : packet duplicate
-     * @return pointer to duplicate packet
-     */
-    UserControlInfo *dup() const override
-    {
-        return new UserControlInfo(*this);
-    }
-
-    void setUserTxParams(const UserTxParams *arg);
-
-    const UserTxParams *getUserTxParams() const
-    {
-        return userTxParams;
-    }
-
-    const unsigned int getBlocks(Remote antenna, Band b) const
-    {
-        return grantedBlocks.at(antenna).at(b);
-    }
-
-    void setBlocks(Remote antenna, Band b, const unsigned int blocks)
-    {
-        grantedBlocks[antenna][b] = blocks;
-    }
-
-    const RbMap& getGrantedBlocks() const
-    {
-        return grantedBlocks;
-    }
-
-    void setGrantedBlocks(const RbMap& rbMap)
-    {
-        grantedBlocks = rbMap;
-    }
-
-    // struct used to request a feedback computation by nodeB
-    FeedbackRequest feedbackReq;
-    void setCoord(const inet::Coord& coord);
-    inet::Coord getCoord() const;
-};
-
-} //namespace
 
 #endif
+

src/simu5g/common/LteControlInfo.h

@@ -11,11 +11,19 @@
 
 import inet.common.INETDefs;
 import inet.common.TagBase;
+import inet.common.geometry.Geometry; // for Coord
 import simu5g.common.LteCommon;
+import simu5g.stack.mac.amc.UserTxParams;
 
 namespace simu5g;
 
 
+class RbMap
+{
+    @existingClass;
+    @opaque;
+}
+
 //
 // Control info usage in Simu5G simulator
 //
@@ -100,8 +108,6 @@ class FlowControlInfo extends LteControlInfo {
 //   txMode, Resource blocks used, RemoteSet
 //
 class UserControlInfo extends LteControlInfo {
-    @customize(true);
-
     bool isNr = false;
     double carrierFrequency = NaN;       // carrier frequency
 
@@ -125,13 +131,21 @@ class UserControlInfo extends LteControlInfo {
     double d2dTxPower = NaN;                            // D2D Transmission Power (used for feedback reporting of D2D links
     // blocks granted on all Remotes, all Bands
     unsigned int totalGrantedBlocks = 0;
-
     unsigned int grantId = 0;                           // grantId related to the grand that allowed the sending of a MEC PDU (used only for MAC PDU sent by UEs)
 
-    //#
-    //# Follows a list of elements only present in
-    //# the customized class (see LteControlInfo.h):
-    //#
-    //# RemoteSet ru;                                // Remote Antenna Set
-    //# RbMap grantedBlocks;                        // Blocks allocated per Remote, per Band.
+    UserTxParams *userTxParams @owned;
+    RbMap grantedBlocks;
+    inet::Coord coord;                                  // The playground position of the sending host
+    FeedbackRequest feedbackReq;
 }
+
+cplusplus (UserControlInfo) {{
+    virtual const unsigned int getBlocks(Remote antenna, Band b) const { return grantedBlocks.at(antenna).at(b); }
+    virtual void setBlocks(Remote antenna, Band b, const unsigned int blocks) { grantedBlocks[antenna][b] = blocks; }
+}}
+
+cplusplus (UserControlInfo::setUserTxParams) {{
+    // Code inserted at top of setUserTxParams(); allows silent overwrite of earlier object.
+    delete this->userTxParams;
+    this->userTxParams = nullptr;
+}}

src/simu5g/common/LteControlInfo.msg

@@ -256,7 +256,7 @@ void LtePhyEnb::requestFeedback(UserControlInfo *lteinfo, LteAirFrame *frame, Pa
     else
         throw cRuntimeError("LtePhyEnbD2D::requestFeedback - channelModel is a null pointer. Abort");
 
-    FeedbackRequest req = lteinfo->feedbackReq;
+    FeedbackRequest req = lteinfo->getFeedbackReq();
     //Feedback computation
     fb.clear();
     //get number of RU
@@ -331,7 +331,7 @@ void LtePhyEnb::handleFeedbackPkt(UserControlInfo *lteinfo,
     *(pktAux->addTagIfAbsent<UserControlInfo>()) = *lteinfo;
 
     // if feedback was generated by dummy phy we can send up to mac else nodeb should generate the "real" feedback
-    if (lteinfo->feedbackReq.request) {
+    if (lteinfo->getFeedbackReq().request) {
         requestFeedback(lteinfo, frame, pktAux);
 
         // DEBUG

src/simu5g/stack/phy/LtePhyEnb.cc

@@ -51,7 +51,7 @@ void LtePhyEnbD2D::requestFeedback(UserControlInfo *lteinfo, LteAirFrame *frame,
         snr = channelModel->getSINR(frame, lteinfo);
     else
         throw cRuntimeError("LtePhyEnbD2D::requestFeedback - channelModel is null pointer. Abort");
-    FeedbackRequest req = lteinfo->feedbackReq;
+    FeedbackRequest req = lteinfo->getFeedbackReq();
     // Feedback computation
     fb.clear();
     // Get number of RU

src/simu5g/stack/phy/LtePhyEnbD2D.cc

@@ -692,7 +692,7 @@ void LtePhyUe::sendFeedback(LteFeedbackDoubleVector fbDl, LteFeedbackDoubleVecto
     // create LteAirFrame and encapsulate a feedback packet
     LteAirFrame *frame = new LteAirFrame("feedback_pkt");
     frame->encapsulate(check_and_cast<cPacket *>(pkt));
-    uinfo->feedbackReq = req;
+    uinfo->setFeedbackReq(req);
     uinfo->setDirection(UL);
     simtime_t signalLength = TTI;
     uinfo->setTxPower(txPower_);

src/simu5g/stack/phy/LtePhyUe.cc

@@ -527,7 +527,7 @@ void LtePhyUeD2D::sendFeedback(LteFeedbackDoubleVector fbDl, LteFeedbackDoubleVe
     // Create LteAirFrame and encapsulate a feedback packet
     LteAirFrame *frame = new LteAirFrame("feedback_pkt");
     frame->encapsulate(check_and_cast<cPacket *>(pkt));
-    uinfo->feedbackReq = req;
+    uinfo->setFeedbackReq(req);
     uinfo->setDirection(UL);
     simtime_t signalLength = TTI;
     uinfo->setTxPower(txPower_);