commit 3313a370a74b515ca381457650844753b3a91b22
author Syed Obaid <obaidasyed@gmail.com> Tue Jul 01 01:31:33 2014 -0500
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 08 12:21:38 2014 -0700
tree 088f6b54979ab681853299b3c1fbe9529ed433a8
parent 29d1fab41e0ec671b2a8e676db7619aea5d79af1

rib-manager: deleting expired entries from the rib and fib.

refs #1326
Change-Id: I865bff19da766560f920b1818bdf3eaa91e7dbb1

rib/rib-entry.cpp

diff --git a/rib/rib-entry.cpp b/rib/rib-entry.cpp
index 98c3b90..5043233 100644
--- a/rib/rib-entry.cpp
+++ b/rib/rib-entry.cpp
@@ -69,6 +69,9 @@
           m_nFacesWithCaptureSet--;
         }
 
+      //cancel any scheduled event
+      scheduler::cancel(it->getExpirationEvent());
+
       m_faces.erase(it);
       return true;
     }
@@ -229,12 +232,17 @@
 operator<<(std::ostream& os, const FaceEntry& entry)
 {
   os << "FaceEntry("
-     << " faceid: " << entry.faceId
-     << " origin: " << entry.origin
-     << " cost: " << entry.cost
-     << " flags: " << entry.flags
-     << " expires in: " << (entry.expires - time::steady_clock::now())
-     << ")";
+     << "faceid: " << entry.faceId
+     << ", origin: " << entry.origin
+     << ", cost: " << entry.cost
+     << ", flags: " << entry.flags;
+  if (entry.expires != time::steady_clock::TimePoint::max()) {
+    os << ", expires in: " << (entry.expires - time::steady_clock::now());
+  }
+  else {
+    os << ", never expires";
+  }
+  os << ")";
 
   return os;
 }
@@ -242,8 +250,8 @@
 std::ostream&
 operator<<(std::ostream& os, const RibEntry& entry)
 {
-  os << "RibEntry{\n";
-  os << "\tName:  " << entry.getName() << "\n";
+  os << "RibEntry {\n";
+  os << "\tName: " << entry.getName() << "\n";
 
   for (RibEntry::FaceList::const_iterator faceIt = entry.cbegin(); faceIt != entry.cend(); ++faceIt)
     {