Separating dynamic limits into a separate forwarding strategy enhancement
Probabilistic method now treats unknown stats as 0.5
diff --git a/model/fw/per-fib-limits.h b/model/fw/per-fib-limits.h
index b377004..ee2eb2c 100644
--- a/model/fw/per-fib-limits.h
+++ b/model/fw/per-fib-limits.h
@@ -24,7 +24,7 @@
#include "ns3/event-id.h"
-#include "fw-stats.h"
+#include "dynamic-limits.h"
#include "../../utils/ndn-pit-queue.h"
namespace ns3 {
@@ -36,10 +36,10 @@
* \brief Strategy implementing per-FIB entry limits
*/
class PerFibLimits :
- public FwStats
+ public DynamicLimits
{
private:
- typedef FwStats super;
+ typedef DynamicLimits super;
public:
static TypeId
@@ -49,11 +49,6 @@
* @brief Default constructor
*/
PerFibLimits ();
-
- virtual void
- OnInterest (Ptr<Face> face,
- Ptr<const InterestHeader> header,
- Ptr<const Packet> origPacket);
virtual void
WillEraseTimedOutPendingInterest (Ptr<pit::Entry> pitEntry);
@@ -81,13 +76,6 @@
private:
void
ProcessFromQueue ();
-
- void
- AnnounceLimits ();
-
- void
- ApplyAnnouncedLimit (Ptr<Face> inFace,
- Ptr<const InterestHeader> header);
// from Object
virtual void
@@ -100,8 +88,8 @@
typedef std::map< Ptr<Face>, PitQueue > PitQueueMap;
PitQueueMap m_pitQueues; // per-outgoing face pit queue
- bool m_announceLimits;
bool m_queueDropNotifications;
+ bool m_weightedRoundRobin;
EventId m_announceEvent;
};