commit f0bda2f215d86e87f397f74f938c037beaab4252
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 12 16:38:13 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 12 16:38:13 2013 -0700
tree 230adbb73788020a7a5190d759aea9071808ec92
parent 260e409de32fb73939dd93532dcdfc35e37eb14b

PyNDN: Removing no longer necessary memory cleanup cheatings

ndn.cxx/ndn-api-face.cc

diff --git a/ndn.cxx/ndn-api-face.cc b/ndn.cxx/ndn-api-face.cc
index 4d522fa..fd78763 100644
--- a/ndn.cxx/ndn-api-face.cc
+++ b/ndn.cxx/ndn-api-face.cc
@@ -51,7 +51,7 @@
     : m_rand (0, std::numeric_limits<uint32_t>::max ())
   {
   }
-  
+
   ns3::UniformVariable m_rand; // nonce generator
 
   PendingInterestContainer m_pendingInterests;
@@ -63,6 +63,8 @@
   : Face (node)
   , m_this (new ApiFacePriv ())
 {
+  NS_LOG_FUNCTION (this << boost::cref (*this));
+
   NS_ASSERT_MSG (GetNode ()->GetObject<L3Protocol> () != 0,
                  "NDN stack should be installed on the node " << GetNode ());
 
@@ -73,19 +75,21 @@
 
 ApiFace::~ApiFace ()
 {
+  NS_LOG_FUNCTION (this << boost::cref (*this));
+
   delete m_this;
 }
 
 void
 ApiFace::Shutdown ()
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << boost::cref (*this));
 
   if (!IsUp ())
     {
       return;
     }
-  
+
   this->SetUp (false);
 
   m_this->m_pendingInterests.clear ();
@@ -105,7 +109,7 @@
     {
       interest->SetNonce (m_this->m_rand.GetValue ());
     }
-  
+
   // Record the callback
   bool needToActuallyExpressInterest = false;
   PendingInterestContainer::iterator entry = m_this->m_pendingInterests.find_exact (interest->GetName ());
@@ -163,7 +167,7 @@
 ApiFace::Put (Ptr<Data> data)
 {
   NS_LOG_INFO (">> D " << data->GetName ());
-  
+
   Simulator::ScheduleNow (&Face::ReceiveData, this, data);
 }
 
@@ -178,7 +182,7 @@
   NS_LOG_FUNCTION (this << interest);
 
   NS_LOG_DEBUG ("<< I " << interest->GetName ());
-  
+
   if (!IsUp ())
     {
       return false;
@@ -222,7 +226,7 @@
       entry = m_this->m_pendingInterests.longest_prefix_match (data->GetName ());
     }
   m_this->m_pendingInterests.erase (entry);
-  
+
   return true;
 }