queueing: added packetRate and dataRate statistics to SlidingWindowRateMeter and ExponentialRateMeter

Author: adamgeorge309

src/inet/queueing/meter/ExponentialRateMeter.cc

@@ -15,6 +15,9 @@ namespace queueing {
 
 Define_Module(ExponentialRateMeter);
 
+simsignal_t ExponentialRateMeter::packetRateSignal = registerSignal("packetRate");
+simsignal_t ExponentialRateMeter::dataRateSignal = registerSignal("dataRate");
+
 void ExponentialRateMeter::initialize(int stage)
 {
     PacketMeterBase::initialize(stage);
@@ -37,6 +40,8 @@ void ExponentialRateMeter::meterPacket(Packet *packet)
         currentNumPackets = 0;
         currentTotalPacketLength = b(0);
         lastUpdate = now;
+        emit(packetRateSignal, packetrate);
+        emit(dataRateSignal, datarate.get());
     }
     currentNumPackets++;
     currentTotalPacketLength += packet->getDataLength();

src/inet/queueing/meter/ExponentialRateMeter.h

@@ -23,6 +23,9 @@ class INET_API ExponentialRateMeter : public PacketMeterBase
     bps datarate = bps(0);
     double packetrate = 0;
 
+    static simsignal_t packetRateSignal;
+    static simsignal_t dataRateSignal;
+
   protected:
     virtual void initialize(int stage) override;
     virtual void meterPacket(Packet *packet) override;

src/inet/queueing/meter/ExponentialRateMeter.ned

@@ -22,4 +22,8 @@ simple ExponentialRateMeter extends PacketMeterBase like IPacketMeter
     parameters:
         double alpha; // Parameter in the range of (0, 1) for the exponential weight decrease
         @class(ExponentialRateMeter);
+        @signal[packetRate](type=double);
+        @statistic[packetRate](title="packet rate"; record=vector; unit=pps; interpolationmode=linear);
+        @signal[dataRate](type=double);
+        @statistic[dataRate](title="data rate"; record=vector; unit=bps; interpolationmode=linear);
 }

src/inet/queueing/meter/SlidingWindowRateMeter.cc

@@ -15,6 +15,9 @@ namespace queueing {
 
 Define_Module(SlidingWindowRateMeter);
 
+simsignal_t SlidingWindowRateMeter::packetRateSignal = registerSignal("packetRate");
+simsignal_t SlidingWindowRateMeter::dataRateSignal = registerSignal("dataRate");
+
 void SlidingWindowRateMeter::initialize(int stage)
 {
     PacketMeterBase::initialize(stage);
@@ -42,6 +45,8 @@ void SlidingWindowRateMeter::meterPacket(Packet *packet)
     }
     datarate = currentTotalPacketLength / s(timeWindow.dbl());
     packetrate = currentNumPackets /timeWindow.dbl();
+    emit(packetRateSignal, packetrate);
+    emit(dataRateSignal, datarate.get());
     auto rateTag = packet->addTagIfAbsent<RateTag>();
     rateTag->setDatarate(datarate);
     rateTag->setPacketrate(packetrate);

src/inet/queueing/meter/SlidingWindowRateMeter.h

@@ -24,6 +24,9 @@ class INET_API SlidingWindowRateMeter : public PacketMeterBase
 
     std::map<simtime_t, b> packetLengths;
 
+    static simsignal_t packetRateSignal;
+    static simsignal_t dataRateSignal;
+
   protected:
     virtual void initialize(int stage) override;
     virtual void meterPacket(Packet *packet) override;

src/inet/queueing/meter/SlidingWindowRateMeter.ned

@@ -20,4 +20,8 @@ simple SlidingWindowRateMeter extends PacketMeterBase like IPacketMeter
     parameters:
         double timeWindow @unit(s); // Amount of time to look back from the current simulation time
         @class(SlidingWindowRateMeter);
+        @signal[packetRate](type=double);
+        @statistic[packetRate](title="packet rate"; record=vector; unit=pps; interpolationmode=linear);
+        @signal[dataRate](type=double);
+        @statistic[dataRate](title="data rate"; record=vector; unit=bps; interpolationmode=linear);
 }