Pdcp: rename: getTxEntity() -> getOrCreateTxEntity(); same for getRxEntity()

Author: avarga

src/simu5g/stack/pdcp/LtePdcp.cc

@@ -192,7 +192,7 @@ void LtePdcpBase::fromDataPort(cPacket *pktAux)
     EV << "LteRrc : Assigned Node ID: " << nodeId_ << "\n";
 
     // get the PDCP entity for this LCID and process the packet
-    LteTxPdcpEntity *entity = getTxEntity(cid);
+    LteTxPdcpEntity *entity = getOrCreateTxEntity(cid);
     entity->handlePacketFromUpperLayer(pkt);
 }
 
@@ -209,7 +209,7 @@ void LtePdcpBase::fromLowerLayer(cPacket *pktAux)
 
     MacCid cid = MacCid(lteInfo->getSourceId(), lteInfo->getLcid());   // TODO: check if you have to get master node id
 
-    LteRxPdcpEntity *entity = getRxEntity(cid);
+    LteRxPdcpEntity *entity = getOrCreateRxEntity(cid);
     entity->handlePacketFromLowerLayer(pkt);
 }
 
@@ -350,7 +350,7 @@ void LtePdcpBase::handleMessage(cMessage *msg)
     }
 }
 
-LteTxPdcpEntity *LtePdcpBase::getTxEntity(MacCid cid)
+LteTxPdcpEntity *LtePdcpBase::getOrCreateTxEntity(MacCid cid)
 {
     // Find entity for this LCID
     PdcpTxEntities::iterator it = txEntities_.find(cid);
@@ -376,7 +376,7 @@ LteTxPdcpEntity *LtePdcpBase::getTxEntity(MacCid cid)
     }
 }
 
-LteRxPdcpEntity *LtePdcpBase::getRxEntity(MacCid cid)
+LteRxPdcpEntity *LtePdcpBase::getOrCreateRxEntity(MacCid cid)
 {
     // Find entity for this CID
     PdcpRxEntities::iterator it = rxEntities_.find(cid);

src/simu5g/stack/pdcp/LtePdcp.h

@@ -148,9 +148,9 @@ class LtePdcpBase : public cSimpleModule
      * @return pointer to the PDCP entity for the CID of the flow
      *
      */
-    virtual LteTxPdcpEntity *getTxEntity(MacCid cid);
+    virtual LteTxPdcpEntity *getOrCreateTxEntity(MacCid cid);
 
-    virtual LteRxPdcpEntity *getRxEntity(MacCid cid);
+    virtual LteRxPdcpEntity *getOrCreateRxEntity(MacCid cid);
 
     /*
      * Dual Connectivity support

src/simu5g/stack/pdcp/LtePdcpEnbD2D.cc

@@ -89,7 +89,7 @@ void LtePdcpEnbD2D::fromDataPort(cPacket *pktAux)
     EV << "LtePdcpEnbD2D : dest ID: " << destId << "\n";
 
     // get the PDCP entity for this LCID and process the packet
-    LteTxPdcpEntity *entity = getTxEntity(cid);
+    LteTxPdcpEntity *entity = getOrCreateTxEntity(cid);
     entity->handlePacketFromUpperLayer(pkt);
 }
 

src/simu5g/stack/pdcp/LtePdcpUeD2D.cc

@@ -120,7 +120,7 @@ void LtePdcpUeD2D::fromDataPort(cPacket *pktAux)
     MacCid cid = MacCid(destId, lcid);
 
     // get the PDCP entity for this CID and process the packet
-    LteTxPdcpEntity *entity = getTxEntity(cid);
+    LteTxPdcpEntity *entity = getOrCreateTxEntity(cid);
     entity->handlePacketFromUpperLayer(pkt);
 }
 

src/simu5g/stack/pdcp/NrPdcpEnb.cc

@@ -90,7 +90,7 @@ void NrPdcpEnb::fromDataPort(cPacket *pktAux)
     EV << "NrPdcpEnb : dest ID: " << destId << "\n";
 
     // get the PDCP entity for this LCID and process the packet
-    LteTxPdcpEntity *entity = getTxEntity(cid);
+    LteTxPdcpEntity *entity = getOrCreateTxEntity(cid);
     entity->handlePacketFromUpperLayer(pkt);
 }
 
@@ -117,7 +117,7 @@ void NrPdcpEnb::fromLowerLayer(cPacket *pktAux)
 
     MacCid cid = MacCid(lteInfo->getSourceId(), lteInfo->getLcid());   // TODO: check if you have to get master node id
 
-    LteRxPdcpEntity *entity = getRxEntity(cid);
+    LteRxPdcpEntity *entity = getOrCreateRxEntity(cid);
     entity->handlePacketFromLowerLayer(pkt);
 }
 
@@ -145,7 +145,7 @@ MacNodeId NrPdcpEnb::getDestId(inet::Ptr<FlowControlInfo> lteInfo)
     return destId;
 }
 
-LteTxPdcpEntity *NrPdcpEnb::getTxEntity(MacCid cid)
+LteTxPdcpEntity *NrPdcpEnb::getOrCreateTxEntity(MacCid cid)
 {
     // Find entity for this CID
     PdcpTxEntities::iterator it = txEntities_.find(cid);
@@ -170,7 +170,7 @@ LteTxPdcpEntity *NrPdcpEnb::getTxEntity(MacCid cid)
     }
 }
 
-LteRxPdcpEntity *NrPdcpEnb::getRxEntity(MacCid cid)
+LteRxPdcpEntity *NrPdcpEnb::getOrCreateRxEntity(MacCid cid)
 {
     // Find entity for this CID
     PdcpRxEntities::iterator it = rxEntities_.find(cid);

src/simu5g/stack/pdcp/NrPdcpEnb.h

@@ -71,8 +71,8 @@ class NrPdcpEnb : public LtePdcpEnbD2D
      * @return Pointer to the PDCP entity for the LCID of the flow
      *
      */
-    LteTxPdcpEntity *getTxEntity(MacCid lcid) override;
-    LteRxPdcpEntity *getRxEntity(MacCid cid) override;
+    LteTxPdcpEntity *getOrCreateTxEntity(MacCid lcid) override;
+    LteRxPdcpEntity *getOrCreateRxEntity(MacCid cid) override;
 
     /*
      * Dual Connectivity support

src/simu5g/stack/pdcp/NrPdcpUe.cc

@@ -145,11 +145,11 @@ void NrPdcpUe::fromDataPort(cPacket *pktAux)
     MacCid cid = MacCid(destId, lcid);
 
     // get the PDCP entity for this CID and process the packet
-    LteTxPdcpEntity *entity = getTxEntity(cid);
+    LteTxPdcpEntity *entity = getOrCreateTxEntity(cid);
     entity->handlePacketFromUpperLayer(pkt);
 }
 
-LteTxPdcpEntity *NrPdcpUe::getTxEntity(MacCid cid)
+LteTxPdcpEntity *NrPdcpUe::getOrCreateTxEntity(MacCid cid)
 {
     // Find entity for this LCID
     PdcpTxEntities::iterator it = txEntities_.find(cid);
@@ -174,7 +174,7 @@ LteTxPdcpEntity *NrPdcpUe::getTxEntity(MacCid cid)
     }
 }
 
-LteRxPdcpEntity *NrPdcpUe::getRxEntity(MacCid cid)
+LteRxPdcpEntity *NrPdcpUe::getOrCreateRxEntity(MacCid cid)
 {
     // Find entity for this CID
     PdcpRxEntities::iterator it = rxEntities_.find(cid);

src/simu5g/stack/pdcp/NrPdcpUe.h

@@ -73,8 +73,8 @@ class NrPdcpUe : public LtePdcpUeD2D
      * @return pointer to the PDCP entity for the LCID of the flow
      *
      */
-    LteTxPdcpEntity *getTxEntity(MacCid lcid) override;
-    LteRxPdcpEntity *getRxEntity(MacCid lcid) override;
+    LteTxPdcpEntity *getOrCreateTxEntity(MacCid lcid) override;
+    LteRxPdcpEntity *getOrCreateRxEntity(MacCid lcid) override;
 
     /*
      * sendToLowerLayer() forwards a PDCP PDU to the RLC layer