cancel pending events upon RLC disposal

src/lte/model/lte-rlc-am.cc

@@ -90,6 +90,15 @@ LteRlcAm::GetTypeId (void)
   return tid;
 }
 
+void
+LteRlcAm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  m_pollRetransmitTimer.Cancel ();
+  m_reorderingTimer.Cancel ();
+  m_statusProhibitTimer.Cancel ();
+}
+
 
 /**
  * RLC SAP

src/lte/model/lte-rlc-am.h

@@ -39,6 +39,7 @@ public:
   LteRlcAm ();
   virtual ~LteRlcAm ();
   static TypeId GetTypeId (void);
+  virtual void DoDispose ();
 
   /**
    * RLC SAP

src/lte/model/lte-rlc-tm.cc

@@ -59,6 +59,13 @@ LteRlcTm::GetTypeId (void)
   return tid;
 }
 
+void
+LteRlcTm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  m_rbsTimer.Cancel ();
+}
+
 
 /**
  * RLC SAP

src/lte/model/lte-rlc-tm.h

@@ -38,6 +38,7 @@ public:
   LteRlcTm ();
   virtual ~LteRlcTm ();
   static TypeId GetTypeId (void);
+  virtual void DoDispose ();
 
   /**
    * RLC SAP

src/lte/model/lte-rlc-um.cc

@@ -67,6 +67,13 @@ LteRlcUm::GetTypeId (void)
   return tid;
 }
 
+void
+LteRlcUm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+  m_reorderingTimer.Cancel ();
+  m_rbsTimer.Cancel ();
+}
 
 /**
  * RLC SAP

src/lte/model/lte-rlc-um.h

@@ -38,6 +38,7 @@ public:
   LteRlcUm ();
   virtual ~LteRlcUm ();
   static TypeId GetTypeId (void);
+  virtual void DoDispose ();
 
   /**
    * RLC SAP

src/lte/model/lte-rlc.cc

@@ -108,6 +108,12 @@ TypeId LteRlc::GetTypeId (void)
   return tid;
 }
 
+void
+LteRlcSm::DoDispose ()
+{
+  NS_LOG_FUNCTION (this);
+}
+
 void
 LteRlc::SetRnti (uint16_t rnti)
 {

src/lte/model/lte-rlc.h

@@ -148,6 +148,7 @@ public:
   LteRlcSm ();
   virtual ~LteRlcSm ();
   static TypeId GetTypeId (void);
+  virtual void DoDispose ();
 
   virtual void DoTransmitPdcpPdu (Ptr<Packet> p);
   virtual void DoNotifyTxOpportunity (uint32_t bytes, uint8_t layer, uint8_t harqId);