ResidenceTimeMeasurer: use signal names from par in receiveSignal, too (fix for #1052)

Author: ZoltanBojthe

src/inet/common/ResidenceTimeMeasurer.cc

@@ -22,8 +22,8 @@ void ResidenceTimeMeasurer::initialize(int stage)
 {
     if (stage == INITSTAGE_LOCAL) {
         auto subscriptionModule = getModuleFromPar<cModule>(par("subscriptionModule"), this);
-        auto measurementStartSignal = registerSignal(par("measurementStartSignal"));
-        auto measurementEndSignal = registerSignal(par("measurementEndSignal"));
+        measurementStartSignal = registerSignal(par("measurementStartSignal"));
+        measurementEndSignal = registerSignal(par("measurementEndSignal"));
         subscriptionModule->subscribe(measurementStartSignal, this);
         subscriptionModule->subscribe(measurementEndSignal, this);
         subscriptionModule->subscribe(packetCreatedSignal, this);
@@ -59,30 +59,15 @@ void ResidenceTimeMeasurer::receiveSignal(cComponent *source, simsignal_t signal
         auto packet = check_and_cast<Packet *>(physicalSignal->getEncapsulatedPacket());
         b offset = b(0);
         b length = packet->getDataLength();
-        if (signal == receptionStartedSignal) {
-            EV_DEBUG << "Reception started" << EV_FIELD(packet) << std::endl;
+        if (signal == measurementStartSignal) {
+            EV_DEBUG << "Measurement started (signal=" << getSignalName(signal) << ") " << EV_FIELD(packet) << std::endl;
             packet->addRegionTagsWhereAbsent<ResidenceTimeTag>(offset, length);
             packet->mapAllRegionTagsForUpdate<ResidenceTimeTag>(offset, length, [&] (b o, b l, const Ptr<ResidenceTimeTag>& tag) {
                 tag->setStartTime(simTime());
             });
         }
-        else if (signal == receptionEndedSignal) {
-            EV_DEBUG << "Reception ended" << EV_FIELD(packet) << std::endl;
-            packet->addRegionTagsWhereAbsent<ResidenceTimeTag>(offset, length);
-            packet->mapAllRegionTagsForUpdate<ResidenceTimeTag>(offset, length, [&] (b o, b l, const Ptr<ResidenceTimeTag>& tag) {
-                tag->setStartTime(simTime());
-            });
-        }
-        else if (signal == transmissionStartedSignal) {
-            EV_DEBUG << "Transmission started" << EV_FIELD(packet) << std::endl;
-            packet->mapAllRegionTagsForUpdate<ResidenceTimeTag>(offset, length, [&] (b o, b l, const Ptr<ResidenceTimeTag>& tag) {
-                tag->setEndTime(simTime());
-            });
-            emit(packetStayedSignal, packet);
-            packet->removeRegionTagsWherePresent<ResidenceTimeTag>(offset, length);
-        }
-        else if (signal == transmissionEndedSignal) {
-            EV_DEBUG << "Transmission ended" << EV_FIELD(packet) << std::endl;
+        else if (signal == measurementEndSignal) {
+            EV_DEBUG << "Measurement ended (signal=" << getSignalName(signal) << ") " << EV_FIELD(packet) << std::endl;
             packet->mapAllRegionTagsForUpdate<ResidenceTimeTag>(offset, length, [&] (b o, b l, const Ptr<ResidenceTimeTag>& tag) {
                 tag->setEndTime(simTime());
             });

src/inet/common/ResidenceTimeMeasurer.h

@@ -15,6 +15,10 @@ namespace inet {
 
 class INET_API ResidenceTimeMeasurer : public SimpleModule, public cListener
 {
+  private:
+    simsignal_t measurementStartSignal = -1;
+    simsignal_t measurementEndSignal = -1;
+
   public:
     static simsignal_t packetStayedSignal;