commit 0ffa7167b7e06b81692c2c13d1faa74fdd337eb0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Aug 21 22:39:22 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:00:50 2012 -0700
tree 9cdf3908215f380d38c25253bd2293ba3a130227
parent 91e1128c51f29a8f9b15a322753d8ba074dcbdf3

One more checkpoint. Now the code seems to work in a basic scenario

model/fw/best-route.cc

diff --git a/model/fw/best-route.cc b/model/fw/best-route.cc
index 604318f..076234f 100644
--- a/model/fw/best-route.cc
+++ b/model/fw/best-route.cc
@@ -62,7 +62,7 @@
                                 Ptr<const Packet> origPacket,
                                 Ptr<pit::Entry> pitEntry)
 {
-  NS_LOG_FUNCTION (this);
+  NS_LOG_FUNCTION (this << header->GetName ());
 
   // Try to work out with just green faces
   bool greenOk = super::DoPropagateInterest (inFace, header, origPacket, pitEntry);

model/fw/per-fib-limits.cc

diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index d79a8fc..d56d48c 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -63,7 +63,6 @@
 PerFibLimits::DoDispose ()
 {
   super::DoDispose ();
-  // m_decayLimitsEvent.Cancel ();
 }
 
 void
@@ -99,21 +98,9 @@
       // just suppress without any other action
       return false;
     }
-  
-  // if (pitEntry->GetFibEntry ()->GetLimits ().IsBelowLimit ())
-  //   {
-  //     if (outFace->GetLimits ().IsBelowLimit ())
-  //       {
-  //         pitEntry->AddOutgoing (outFace);
-  //         return true;
-  //       }
-  //     else
-  //       {
-  //         NS_LOG_DEBUG ("Face limit. Reverting back per-prefix allowance");
-  //         pitEntry->GetFibEntry ()->GetLimits ().RemoveOutstanding ();
-  //       }
-  //   }
 
+  NS_LOG_DEBUG ("Limit: " << outFace->GetLimits ().m_curMaxLimit << ", outstanding: " << outFace->GetLimits ().m_outstanding);
+  
   if (outFace->GetLimits ().IsBelowLimit ())
     {
       pitEntry->AddOutgoing (outFace);
@@ -122,15 +109,14 @@
       Ptr<Packet> packetToSend = origPacket->Copy ();
       outFace->Send (packetToSend);
 
-      DidSendOutInterest (outFace, header, origPacket, pitEntry);
-      
+      DidSendOutInterest (outFace, header, origPacket, pitEntry);      
       return true;
     }
   else
     {
-      NS_LOG_DEBUG ("Face limit");
+      NS_LOG_DEBUG ("Face limit for " << header->GetName ());
     }
-  
+
   bool enqueued = m_pitQueues[outFace].Enqueue (inFace, pitEntry);
   if (enqueued)
     {
@@ -157,7 +143,6 @@
     }
 
   ProcessFromQueue ();
-  // pitEntry->GetFibEntry ()->GetLimits ().RemoveOutstanding ();
 }
 
 
@@ -178,29 +163,38 @@
     }
 
   ProcessFromQueue ();
-  
-  // pitEntry->GetFibEntry ()->GetLimits ().RemoveOutstanding ();
 }
 
 
 void
 PerFibLimits::ProcessFromQueue ()
 {
+  NS_LOG_FUNCTION (this);
+  
   for (PitQueueMap::iterator queue = m_pitQueues.begin ();
        queue != m_pitQueues.end ();
        queue++)
     {
       Ptr<Face> outFace = queue->first;
+
+      NS_LOG_DEBUG ("Processing " << *outFace);
       
       while (!queue->second.IsEmpty () && outFace->GetLimits ().IsBelowLimit ())
         {
           // now we have enqueued packet and have slot available. Send out delayed packet
           Ptr<pit::Entry> pitEntry = queue->second.Pop ();
+
+          // wrong, but for experimental purposes
+          // pitEntry->UpdateLifetime (pitEntry->GetInterest ()->GetInterestLifetime ());
+          
+          NS_ASSERT_MSG (pitEntry != 0, "There *have to* be an entry in queue");
+          
           pitEntry->AddOutgoing (outFace);
 
           Ptr<Packet> packetToSend = Create<Packet> ();
           packetToSend->AddHeader (*pitEntry->GetInterest ());
-          
+
+          NS_LOG_DEBUG ("Delayed sending for " << pitEntry->GetPrefix ());
           outFace->Send (packetToSend);
           DidSendOutInterest (outFace, pitEntry->GetInterest (), packetToSend, pitEntry);
         }
@@ -217,19 +211,6 @@
 //   // ??
 // }
 
-// void
-// PerFibLimits::DecayLimits ()
-// {
-//   for (Ptr<fib::Entry> entry = m_fib->Begin ();
-//        entry != m_fib->End ();
-//        entry = m_fib->Next (entry))
-//     {
-//       entry->GetLimits ().DecayCurrentLimit ();
-//     }
-
-//   m_decayLimitsEvent = Simulator::Schedule (Seconds (1.0), &PerFibLimits::DecayLimits, this);
-// }
-
 
 } // namespace fw
 } // namespace ndn