merge.

[nepi.git] / src / nepi / testbeds / planetlab / scripts / classqueue.py

diff --git a/src/nepi/testbeds/planetlab/scripts/classqueue.py b/src/nepi/testbeds/planetlab/scripts/classqueue.py
index f36fbd3..0fcae27 100644 (file)
--- a/src/nepi/testbeds/planetlab/scripts/classqueue.py
+++ b/src/nepi/testbeds/planetlab/scripts/classqueue.py
@@ -2,7 +2,14 @@ import collections
 import itertools
 import random
 import re
+import sys
+import iovec
 
+dstats = collections.defaultdict(int)
+astats = collections.defaultdict(int)
+dump_count = [0]
+
+_red = True
 _size = 1000
 _classes = (
     "igmp.ggp.cbt.egp.igp.idrp.mhrp.narp.ospf.eigrp*p1:"
@@ -71,7 +78,7 @@ class ClassQueue(object):
     def __init__(self):
         self.size = _size
         self.len = 0
-        
+
         # Prepare classes
         self.classspec = _parse_classes(_classes)
 
@@ -124,7 +131,7 @@ class ClassQueue(object):
     
     def __len__(self):
         return self.len
-    
+
     def clear(self):
         self.classes.clear()
         self.cycle = None
@@ -140,19 +147,41 @@ class ClassQueue(object):
             if rv is None:
                 rv = self.classmap.get(None)
         else:
+            proto = 0
             rv = self.classmap.get(None)
-        return rv, self.sizemap[rv]
+        return proto, rv, self.sizemap[rv]
     
-    def append(self, packet, len=len):
-        qi,size = self.queuefor(packet)
+    def get_packetdrop_p(self, qlen, qsize, packet):
+        pdrop = ((qlen * 1.0 / qsize) - 0.5) * 2.0
+        pdrop *= pdrop
+        return pdrop
+    
+    def append(self, packet, len=len, dstats=dstats, astats=astats, rng=random.random):
+        proto,qi,size = self.queuefor(packet)
         q = self.queues[qi]
-        if len(q) < size:
-            classes = self.classes
-            if qi not in classes:
-                classes.add(qi)
-                self.cycle_update = True
-            q.append(packet)
-            self.len += 1
+        lq = len(q)
+        if lq < size:
+            dropped = 0
+            if lq > (size/2) and _red:
+                pdrop = self.get_packetdrop_p(lq, size, packet)
+                if rng() < pdrop:
+                    dropped = 1
+            if not dropped:
+                classes = self.classes
+                if qi not in classes:
+                    classes.add(qi)
+                    self.cycle_update = True
+                q.append(packet)
+                self.len += 1
+        # packet dropped
+        else:
+            dropped = 1
+        if _logdropped:
+            if dropped:
+                dstats[proto] += 1
+            else:
+                astats[proto] += 1
+            self.dump_stats()
 
     def appendleft(self, packet):
         self.queues[-1].append(packet)
@@ -161,7 +190,7 @@ class ClassQueue(object):
     def pop(self, xrange=xrange, len=len, iter=iter, pop=collections.deque.pop):
         return self.popleft(pop=pop)
     
-    def popleft(self, xrange=xrange, len=len, iter=iter, pop=collections.deque.popleft):
+    def popleft(self, xrange=xrange, len=len, iter=iter, enumerate=enumerate, zip=zip, pop=collections.deque.popleft):
         queues = self.queues
         classes = self.classes
 
@@ -197,18 +226,33 @@ class ClassQueue(object):
         else:
             raise IndexError, "pop from an empty queue"
 
+    def dump_stats(self, astats=astats, dstats=dstats, dump_count=dump_count):
+        if dump_count[0] >= 10000:
+            dstatsstr = "".join(['%s:%s\n' % (key, value) for key, value in dstats.items()])
+            astatsstr = "".join(['%s:%s\n' % (key, value) for key, value in astats.items()])
+            fd = open('dropped_stats', 'w')
+            iovec.writev(fd.fileno(), "Dropped:\n", dstatsstr, "Accepted:\n", astatsstr)
+            fd.close()
+            dump_count[0] = 0
+        else:
+            dump_count[0] += 1
+
 queueclass = ClassQueue
 
-def init(size, classes):
-    global _size
-    _size = size
+def init(size = 1000, classes = _classes, logdropped = 'False', red = True):
+    global _size, _classes, _logdropped
+    _size = int(size)
     _classes = classes
+    _red = red
+    _logdropped = logdropped.lower() in ('true','1','on')
     
-
+    if _logdropped:
+        # Truncate stats
+        open('dropped_stats', 'w').close()
 
 _protomap = {
     '3pc'      :       34,
-    'a/n'      :       107,
+    'an'       :       107,
     'ah'       :       51,
     'argus'    :       13,
     'aris'     :       104,