cosmetics: make emit calls with if-ladder more concise

Author: avarga

src/simu5g/background/cell/BackgroundScheduler.cc

@@ -263,10 +263,8 @@ void BackgroundScheduler::updateAllocation(Direction dir)
     }
 
     // emit statistics
-    if (dir == DL)
-        emit(bgAvgServedBlocksDlSignal_, (long)b);
-    else
-        emit(bgAvgServedBlocksUlSignal_, (long)b);
+    simsignal_t signal = (dir == DL) ? bgAvgServedBlocksDlSignal_ : bgAvgServedBlocksUlSignal_;
+    emit(signal, (long)b);
 
     EV << "----- END BACKGROUND CELL ALLOCATION UPDATE -----" << endl;
 }

src/simu5g/background/trafficGenerator/generators/TrafficGeneratorBase.cc

@@ -252,10 +252,8 @@ unsigned int TrafficGeneratorBase::consumeBytes(int bytes, Direction dir, bool r
     }
 
     // this simulates a transmission, so emit CQI statistic
-    if (dir == DL)
-        emit(bgAverageCqiDlSignal_, (long)cqi_[DL]);
-    else
-        emit(bgAverageCqiUlSignal_, (long)cqi_[UL]);
+    simsignal_t cqiSignal = (dir == DL) ? bgAverageCqiDlSignal_ : bgAverageCqiUlSignal_;
+    emit(cqiSignal, (long)cqi_[dir]);
 
     // "schedule" a retransmission with the given probability
     double err = uniform(0.0, 1.0);
@@ -265,16 +263,12 @@ unsigned int TrafficGeneratorBase::consumeBytes(int bytes, Direction dir, bool r
         rtxNotification->setBytes(bytes);
         scheduleAt(NOW + rtxDelay_[dir], rtxNotification);
 
-        if (dir == DL)
-            emit(bgHarqErrorRateDlSignal_, 1.0);
-        else
-            emit(bgHarqErrorRateUlSignal_, 1.0);
+        simsignal_t harqErrorSignal = (dir == DL) ? bgHarqErrorRateDlSignal_ : bgHarqErrorRateUlSignal_;
+        emit(harqErrorSignal, 1.0);
     }
     else {
-        if (dir == DL)
-            emit(bgHarqErrorRateDlSignal_, 0.0);
-        else
-            emit(bgHarqErrorRateUlSignal_, 0.0);
+        simsignal_t harqErrorSignal = (dir == DL) ? bgHarqErrorRateDlSignal_ : bgHarqErrorRateUlSignal_;
+        emit(harqErrorSignal, 0.0);
     }
 
     return (!rtx) ? bufferedBytes_[dir] : bufferedBytesRtx_[dir];
@@ -291,10 +285,8 @@ void TrafficGeneratorBase::receiveSignal(cComponent *source, simsignal_t signalI
 
 void TrafficGeneratorBase::collectMeasuredSinr(double sample, Direction dir)
 {
-    if (dir == DL)
-        emit(bgMeasuredSinrDlSignal_, sample);
-    else
-        emit(bgMeasuredSinrUlSignal_, sample);
+    simsignal_t signal = (dir == DL) ? bgMeasuredSinrDlSignal_ : bgMeasuredSinrUlSignal_;
+    emit(signal, sample);
 }
 
 } //namespace

src/simu5g/stack/mac/LteMacEnb.cc

@@ -749,10 +749,8 @@ bool LteMacEnb::bufferizePacket(cPacket *pktAux)
             totalOverflowedBytes_ += pkt->getByteLength();
             double sample = (double)totalOverflowedBytes_ / (NOW - getSimulation()->getWarmupPeriod());
 
-            if (lteInfo->getDirection() == DL)
-                emit(macBufferOverflowDlSignal_, sample);
-            else
-                emit(macBufferOverflowUlSignal_, sample);
+            simsignal_t signal = (lteInfo->getDirection() == DL) ? macBufferOverflowDlSignal_ : macBufferOverflowUlSignal_;
+            emit(signal, sample);
 
             EV << "LteMacBuffers : Dropped packet: queue" << cid << " is full\n";
             // @author Alessandro Noferi

src/simu5g/stack/mac/LteMacUe.cc

@@ -323,12 +323,8 @@ bool LteMacUe::bufferizePacket(cPacket *pktAux)
         if (!queue->pushBack(pkt)) {
             totalOverflowedBytes_ += pkt->getByteLength();
             double sample = (double)totalOverflowedBytes_ / (NOW - getSimulation()->getWarmupPeriod());
-            if (lteInfo->getDirection() == DL) {
-                emit(macBufferOverflowDlSignal_, sample);
-            }
-            else {
-                emit(macBufferOverflowUlSignal_, sample);
-            }
+            simsignal_t signal = (lteInfo->getDirection() == DL) ? macBufferOverflowDlSignal_ : macBufferOverflowUlSignal_;
+            emit(signal, sample);
 
             EV << "LteMacBuffers : Dropped packet: queue" << cid << " is full\n";
 

src/simu5g/stack/rlc/tm/LteRlcTm.cc

@@ -41,10 +41,8 @@ void LteRlcTm::handleUpperMessage(cPacket *pktAux)
         EV << "LteRlcTm : Dropping packet " << pkt->getName() << " (queue full) \n";
 
         // statistics: packet was lost
-        if (lteInfo->getDirection() == DL)
-            emit(rlcPacketLossDlSignal_, 1.0);
-        else
-            emit(rlcPacketLossUlSignal_, 1.0);
+        simsignal_t signal = (lteInfo->getDirection() == DL) ? rlcPacketLossDlSignal_ : rlcPacketLossUlSignal_;
+        emit(signal, 1.0);
 
         drop(pkt);
         delete pkt;
@@ -63,10 +61,8 @@ void LteRlcTm::handleUpperMessage(cPacket *pktAux)
     queuedPdus_.insert(pkt);
 
     // statistics: packet was not lost
-    if (lteInfo->getDirection() == DL)
-        emit(rlcPacketLossDlSignal_, 0.0);
-    else
-        emit(rlcPacketLossUlSignal_, 0.0);
+    simsignal_t signal = (lteInfo->getDirection() == DL) ? rlcPacketLossDlSignal_ : rlcPacketLossUlSignal_;
+    emit(signal, 0.0);
 
     // create a message to notify the MAC layer that the queue contains new data
     auto newDataPkt = inet::makeShared<LteRlcPduNewData>();