Checkpoint. Max bad/good ratio is 1:10. Unknown stats implies 50%. If
anything is in a queue, item will be taken from it (no matter what is
the service count)
diff --git a/utils/ndn-limits.cc b/utils/ndn-limits.cc
index d53e370..d1b19c7 100644
--- a/utils/ndn-limits.cc
+++ b/utils/ndn-limits.cc
@@ -149,6 +149,7 @@
if (m_outstanding < value)
{
m_outstanding += 1.0;
+ // if (Simulator::GetContext () == 6) std::cout << "." << std::flush;
return true;
}
else
@@ -166,6 +167,8 @@
{
if (!IsEnabled ()) return; //limits are disabled
+ // if (Simulator::GetContext () == 6) std::cout << "*" << std::flush;
+
NS_LOG_DEBUG (m_outstanding);
NS_ASSERT_MSG (m_outstanding >= 1, "Should not be possible, unless we decreasing this number twice somewhere");
m_outstanding -= 1;
diff --git a/utils/ndn-pit-queue.cc b/utils/ndn-pit-queue.cc
index 0c7349f..ca0d755 100644
--- a/utils/ndn-pit-queue.cc
+++ b/utils/ndn-pit-queue.cc
@@ -35,7 +35,7 @@
namespace ns3 {
namespace ndn {
-const double MIN_WEIGHT = 0.01;
+const double MIN_WEIGHT = 0.1;
PitQueue::PitQueue ()
// : m_maxQueueSize (20)
@@ -61,6 +61,7 @@
Ptr<pit::Entry> pitEntry,
double updatedWeight)
{
+ if (updatedWeight < 0) updatedWeight = 0.5;
if (updatedWeight < MIN_WEIGHT) updatedWeight = MIN_WEIGHT;
PerInFaceQueue::iterator queue = m_queues.find (inFace);
@@ -101,9 +102,10 @@
PerInFaceQueue::iterator queue = m_lastQueue;
if (queue != m_queues.end () &&
- true)
+ m_serviceCounter >= queue->second->get<2> ())
{
- queue ++; // actually implement round robin...
+ queue ++; // actually implement weighted round robin...
+ m_serviceCounter = 0;
}
while (queue != m_queues.end () && queue->second->get<0> ().size () == 0) // advance iterator
@@ -124,11 +126,12 @@
m_serviceCounter = 0;
}
- if (queue == m_queues.end ()) // e.g., begin () == end ()
- return 0;
-
- // if (Simulator::GetContext () == 7)
+ m_serviceCounter ++;
+
+ // if (Simulator::GetContext () == 4)
// {
+ // cout << "====== " << Simulator::Now ().ToDouble (Time::S) << "s " << *queue->first << endl;
+ // cout << " " << m_serviceCounter << " / " << queue->second->get<2> () << "\n";
// for (PerInFaceQueue::const_iterator somequeue = m_queues.begin ();
// somequeue != m_queues.end ();
// somequeue ++)
@@ -139,6 +142,9 @@
// cout << endl;
// }
+ if (queue == m_queues.end () || queue->second->get<0> ().size () == 0)
+ return 0;
+
NS_ASSERT_MSG (queue->second->get<0> ().size () != 0, "Logic error");
Ptr<pit::Entry> entry = *queue->second->get<0> ().begin ();
@@ -152,7 +158,7 @@
#ifdef NS3_LOG_ENABLE
NS_ASSERT_MSG (queue->second->get<0> ().size () == queueSize-1, "Queue size should be reduced by one");
#endif
-
+
m_lastQueue = queue;
return entry;
}
@@ -235,8 +241,22 @@
queue != m_queues.end ();
queue ++)
{
- queue->second->get<2> () = static_cast<uint32_t>((queue->second->get<1> () + 0.5) / minWeight);
+ queue->second->get<2> () = static_cast<uint32_t>(queue->second->get<1> () / minWeight);
+ if (queue->second->get<2> () < 1)
+ queue->second->get<2> () = 1;
}
+
+ // if (m_queues.size () > 1)
+ // {
+ // cout << "Node " << Simulator::GetContext () << " (min = " << minWeight << "): ";
+ // for (PerInFaceQueue::const_iterator queue = m_queues.begin ();
+ // queue != m_queues.end ();
+ // queue ++)
+ // {
+ // cout << queue->second->get<1> () << "/" << queue->second->get<2> () << " ";
+ // }
+ // cout << endl;
+ // }
}