LteMacEnb: bufferizeBsr(): createBsrBuffer() factored out

Author: avarga

src/simu5g/stack/mac/LteMacEnb.cc

@@ -278,56 +278,57 @@ void LteMacEnb::macSduRequest()
     EV << "------ END LteMacEnb::macSduRequest ------\n";
 }
 
+LteMacBuffer* LteMacEnb::createBsrBuffer(MacCid cid)
+{
+    // Create new BSR buffer
+    LteMacBuffer *bsrqueue = new LteMacBuffer();
+    bsrbuf_[cid] = bsrqueue;
+
+    EV << "LteBsrBuffers : Added new BSR buffer for node: "
+       << cid.getNodeId() << " for LCID: " << cid.getLcid() << "\n";
+
+    return bsrqueue;
+}
+
 void LteMacEnb::bufferizeBsr(MacBsr *bsr, MacCid cid)
 {
     LteMacBufferMap::iterator it = bsrbuf_.find(cid);
+    LteMacBuffer *bsrqueue = nullptr;
+
+    // If connection not found, create it
     if (it == bsrbuf_.end()) {
-        if (bsr->getSize() > 0) {
-            // Queue not found for this CID: create
-            LteMacBuffer *bsrqueue = new LteMacBuffer();
+        bsrqueue = createBsrBuffer(cid);
+    }
+    else {
+        bsrqueue = it->second;
+    }
 
-            PacketInfo vpkt(bsr->getSize(), bsr->getTimestamp());
-            bsrqueue->pushBack(vpkt);
-            bsrbuf_[cid] = bsrqueue;
+    // Insert into queue
+    if (bsr->getSize() > 0) {
+        // Update buffer with new BSR data
+        PacketInfo queuedBsr;
+        if (!bsrqueue->isEmpty())
+            queuedBsr = bsrqueue->popFront();
 
-            EV << "LteBsrBuffers : Added new BSR buffer for node: "
-               << cid.getNodeId() << " for LCID: " << cid.getLcid()
-               << " Current BSR size: " << bsr->getSize() << "\n";
+        queuedBsr.first = bsr->getSize();
+        queuedBsr.second = bsr->getTimestamp();
+        bsrqueue->pushBack(queuedBsr);
 
-            // signal backlog to Uplink scheduler
-            enbSchedulerUl_->backlog(cid);
-        }
-        // do not store if BSR size = 0
+        EV << "LteBsrBuffers : BSR buffer for node: " << cid.getNodeId()
+           << " for LCID: " << cid.getLcid()
+           << " Current BSR size: " << bsr->getSize() << "\n";
+
+        // Signal backlog to Uplink scheduler
+        enbSchedulerUl_->backlog(cid);
     }
     else {
-        // Found
-        LteMacBuffer *bsrqueue = it->second;
-        if (bsr->getSize() > 0) {
-            // update buffer
-            PacketInfo queuedBsr;
-            if (!bsrqueue->isEmpty())
-                queuedBsr = bsrqueue->popFront();
-
-            queuedBsr.first = bsr->getSize();
-            queuedBsr.second = bsr->getTimestamp();
-            bsrqueue->pushBack(queuedBsr);
-
-            EV << "LteBsrBuffers : Using old buffer for node: " << cid.getNodeId()
-                    << " for LCID: " << cid.getLcid()
-               << " Current BSR size: " << bsr->getSize() << "\n";
-
-            // signal backlog to Uplink scheduler
-            enbSchedulerUl_->backlog(cid);
-        }
-        else {
-            // the UE has no backlog, remove BSR
-            if (!bsrqueue->isEmpty())
-                bsrqueue->popFront();
+        // The UE has no backlog, remove BSR
+        if (!bsrqueue->isEmpty())
+            bsrqueue->popFront();
 
-            EV << "LteBsrBuffers : Using old buffer for node: " << cid.getNodeId()
-                    << " for LCID: " << cid.getLcid()
-               << " - now empty" << "\n";
-        }
+        EV << "LteBsrBuffers : BSR buffer for node: " << cid.getNodeId()
+           << " for LCID: " << cid.getLcid()
+           << " - now empty" << "\n";
     }
 }
 

src/simu5g/stack/mac/LteMacEnb.h

@@ -122,6 +122,14 @@ class LteMacEnb : public LteMacBase
      */
     void bufferizeBsr(MacBsr *bsr, MacCid cid);
 
+    /**
+     * createBsrBuffer() creates a new BSR buffer for the given CID
+     *
+     * @param cid connection id for this bsr
+     * @return pointer to the newly created LteMacBuffer
+     */
+    LteMacBuffer *createBsrBuffer(MacCid cid);
+
     /**
      * bufferizePacket() is called every time a packet is
      * received from the upper layer.