Fix a problem (possible division by 0) within the BaseStationStatsCollector

Author: giovanninardini

simulations/NR/mec/multiMecHost/omnetpp.ini

@@ -29,6 +29,13 @@ num-rngs = 3
 *.configurator.config = xmldoc("./demo.xml")
 
 
+# tcp settings
+**.tcp.typename = "Tcp"
+**.tcp.advertisedWindow = 65535         # in bytes, corresponds with the maximal receiver buffer capacity (Note: normally, NIC queues should be at least this size)
+**.tcp.tcpAlgorithmClass = "TcpReno"    # TcpReno/TcpTahoe/TcpNewReno/TcpNoCongestionControl/DumbTcp
+**.tcp.sackSupport = true               # Selective Acknowledgment (RFC 2018, 2883, 3517) support (header option) (SACK will be enabled for a connection if both endpoints support it)
+
+
 #------------------------------------#
 # Config MultiMec
 #
@@ -113,14 +120,9 @@ network = simu5g.simulations.NR.mec.multiMecHost.MultiMecHost
 *.ue[*].app[1].positionY = 600
 #------------------------------------#
 
+
 ############ MEC Configuration ############
-**.hasRNISupport = true
 
-# tcp settings
-**.tcp.typename = "Tcp"
-**.tcp.advertisedWindow = 65535         # in bytes, corresponds with the maximal receiver buffer capacity (Note: normally, NIC queues should be at least this size)
-**.tcp.tcpAlgorithmClass = "TcpReno"    # TcpReno/TcpTahoe/TcpNewReno/TcpNoCongestionControl/DumbTcp
-**.tcp.sackSupport = true               # Selective Acknowledgment (RFC 2018, 2883, 3517) support (header option) (SACK will be enabled for a connection if both endpoints support it)
 
 # MEC Hosts
 **.mecHost*.virtualisationInfrastructure.ipv4.forwarding = true

simulations/NR/mec/singleMecHost/omnetpp.ini

@@ -105,7 +105,6 @@ network = simu5g.simulations.NR.mec.singleMecHost.singleMecHost
 **.tcp.tcpAlgorithmClass = "TcpReno"    # TcpReno/TcpTahoe/TcpNewReno/TcpNoCongestionControl/DumbTcp
 **.tcp.sackSupport = true               # Selective Acknowledgment (RFC 2018, 2883, 3517) support (header option) (SACK will be enabled for a connection if both endpoints support it)
 
-**.hasRNISupport = true
 ##########################################################
 #                    App Layer                           #
 ##########################################################

src/corenetwork/statsCollector/BaseStationStatsCollector.cc

@@ -80,10 +80,7 @@ void BaseStationStatsCollector::initialize(int stage){
             EV << collectorType_ << "::initialize - packetFlowManager reference" << endl;
             packetFlowManager_ = check_and_cast<PacketFlowManagerEnb *>(getParentModule()->getSubmodule("cellularNic")->getSubmodule("packetFlowManager"));
         }
-        else
-        {
-            EV << "NON CI STA" << endl;
-        }
+
         cellInfo_ = check_and_cast<CellInfo *>(getParentModule()->getSubmodule("cellInfo"));
         ecgi_.cellId = cellInfo_->getMacCellId(); // at least stage 2
 
@@ -336,7 +333,10 @@ void BaseStationStatsCollector::add_ul_nongbr_pdr_cell()
         pair.total += temp.total;
     }
 
-    pdr = ((double)pair.discarded * 1000000)/ pair.total;
+    if (pair.total == 0)
+        pdr = 0.0;
+    else
+        pdr = ((double)pair.discarded * 1000000)/ pair.total;
     ul_nongbr_pdr_cell.addValue((int)pdr);
 }
 

src/stack/packetFlowManager/PacketFlowManagerEnb.cc

@@ -823,6 +823,8 @@ double PacketFlowManagerEnb::getDiscardedPktPerUe(MacNodeId id)
 
 double PacketFlowManagerEnb::getDiscardedPkt()
 {
+    if (pktDiscardCounterTotal_.total == 0)
+        return 0.0;
     return ((double)pktDiscardCounterTotal_.discarded * 1000000)/pktDiscardCounterTotal_.total;
 }
 

tests/fingerprint/mec/mec.csv

@@ -1,4 +1,4 @@
 # workingdir,                            args,                                                  simtimelimit,    fingerprint,
-/simulations/NR/mec/singleMecHost,       -f omnetpp.ini -c SingleMec -r 0,       20s,              105e-03d6/tlx,PASS,
-/simulations/NR/mec/multiMecHost,        -f omnetpp.ini -c MultiMec -r 0,        20s,              4cf8-bd34/tlx,PASS,
+/simulations/NR/mec/singleMecHost,       -f omnetpp.ini -c SingleMec -r 0,       20s,              bf93-3e95/tlx,PASS,
+/simulations/NR/mec/multiMecHost,        -f omnetpp.ini -c MultiMec -r 0,        20s,              4e70-3039/tlx,PASS,
 /simulations/NR/mec/RNIDelay,            -f omnetpp.ini -c Test -r 0,       5s,              eadb-62b5/tlx,PASS,