commit be494e27929c1ac744b9b473565ffdee9f292bc5
Author: Andras Varga <[email protected]>
Date:   Mon Dec 8 11:15:14 2014 +0100

    tkenv: fix #796: Apparent leaking of messages in Tkenv
    
    The bug: Internal copies of messages should not be reflected in the statistics.

diff --git a/include/cmessage.h b/include/cmessage.h
index 2603ab0..cbd5024 100644
--- a/include/cmessage.h
+++ b/include/cmessage.h
@@ -113,6 +113,9 @@ class SIM_API cMessage : public cOwnedObject
     friend class LogBuffer;  // for setMessageId()
 
   private:
+    enum {
+        FL_ISPRIVATECOPY = 4,
+    };
     // note: fields are in an order that maximizes packing (minimizes sizeof(cMessage))
     short msgkind;             // message kind -- 0>= user-defined meaning, <0 reserved
     short prior;               // priority -- used for scheduling msgs with equal times
@@ -150,6 +153,9 @@ class SIM_API cMessage : public cOwnedObject
     void setId(long id) {msgid = id;}
 
   public:
+    // internal: create an exact clone (including msgid) that doesn't show up in the statistics
+    cMessage* privateDup() const;
+
     // internal: returns the event number which scheduled this event, or the event in which
     // this message was last delivered to a module. Stored for recording into the event log file.
     eventnumber_t getPreviousEventNumber() const {return prev_event_num;}
@@ -711,8 +717,8 @@ class SIM_API cPacket : public cMessage
 {
   private:
     enum {
-        FL_ISRECEPTIONSTART = 4,
-        FL_BITERROR = 8,
+        FL_ISRECEPTIONSTART = 8,
+        FL_BITERROR = 16,
     };
     int64 len;            // length of the packet in bits -- used for bit error and transmission delay modeling
     simtime_t duration;   // transmission duration on last channel with datarate
diff --git a/src/sim/cmessage.cc b/src/sim/cmessage.cc
index fe99bc7..b18dfa1 100644
--- a/src/sim/cmessage.cc
+++ b/src/sim/cmessage.cc
@@ -114,7 +114,9 @@ cMessage::~cMessage()
         else
             delete ctrlp;
     }
-    live_msgs--;
+
+    if ((flags & FL_ISPRIVATECOPY) == 0)
+        live_msgs--;
 }
 
 std::string cMessage::info() const
@@ -275,6 +277,17 @@ void cMessage::_createparlist()
     take(parlistp);
 }
 
+cMessage *cMessage::privateDup() const
+{
+    cMessage *ret = dup();
+    ret->msgid = msgid;
+    ret->flags |= FL_ISPRIVATECOPY;
+    ret->removeFromOwnershipTree();
+    total_msgs--;
+    live_msgs--;
+    return ret;
+}
+
 void cMessage::setControlInfo(cObject *p)
 {
     if (!p)
diff --git a/src/tkenv/logbuffer.cc b/src/tkenv/logbuffer.cc
index 65a71ac..93f0040 100644
--- a/src/tkenv/logbuffer.cc
+++ b/src/tkenv/logbuffer.cc
@@ -153,9 +153,7 @@ void LogBuffer::beginSend(cMessage *msg)
     Entry *entry = entries.back();
     entry->msgs.push_back(MessageSend());
     MessageSend& msgsend = entry->msgs.back();
-    msgsend.msg = msg->dup();
-    msgsend.msg->setId(msg->getId()); // because dup() assigns a new Id
-    msgsend.msg->removeFromOwnershipTree();
+    msgsend.msg = msg->privateDup();
     msgsend.hopModuleIds.push_back(msg->getSenderModuleId());
 }