commit b18ae02f9dec41e4798d233c2cf240c460adbc36
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Sep 03 21:46:36 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Sep 03 23:49:03 2012 -0700
tree 9699d9d66ee51fb0556091e88d9c384502ea34f0
parent c202fd9464374b1af791d202f761a0d75de01597

Memory optimization (removing scheduled events instead of just cancelling them)

apps/ndn-consumer.cc

diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index 2c13925..98febd7 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -114,7 +114,10 @@
 {
   m_retxTimer = retxTimer;
   if (m_retxEvent.IsRunning ())
-    m_retxEvent.Cancel (); // cancel any scheduled cleanup events
+    {
+      // m_retxEvent.Cancel (); // cancel any scheduled cleanup events
+      Simulator::Remove (m_retxEvent); // slower, but better for memory
+    }
 
   // schedule even with new timeout
   m_retxEvent = Simulator::Schedule (m_retxTimer,

model/pit/ndn-pit-impl.cc

diff --git a/model/pit/ndn-pit-impl.cc b/model/pit/ndn-pit-impl.cc
index bb8e42a..da3f4f3 100644
--- a/model/pit/ndn-pit-impl.cc
+++ b/model/pit/ndn-pit-impl.cc
@@ -170,8 +170,9 @@
 template<class Policy>
 void
 PitImpl<Policy>::RescheduleCleaning ()
-{
-  m_cleanEvent.Cancel ();
+{  
+  // m_cleanEvent.Cancel ();
+  Simulator::Remove (m_cleanEvent); // slower, but better for memory
   if (i_time.empty ())
     {
       // NS_LOG_DEBUG ("No items in PIT");