[or-cvs] r18225: {torflow} Grr, messed up some of the rank checking code. (torflow/trunk/CircuitAnalysis/BuildTimes)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-01-22 07:21:57 -0500 (Thu, 22 Jan 2009)
New Revision: 18225

Modified:
   torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py
   torflow/trunk/CircuitAnalysis/BuildTimes/full_run.sh
Log:

Grr, messed up some of the rank checking code.



Modified: torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py	2009-01-22 12:17:38 UTC (rev 18224)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/dist_check.py	2009-01-22 12:21:57 UTC (rev 18225)
@@ -157,21 +157,43 @@
   rankfile = open(pathfile+".ranks", "r")
   for line in rankfile:
     nodes = map(lambda n: n.strip(), line.split(" "))
+    ranks = []
+    bws = []
     if nodes[0] == 'r': # rank list
       ranks = map(int, nodes[2:])   
     elif nodes[0] == 'b': # bw list
       bws = map(int, nodes[2:])
     router = router_map[nodes[1]]
-    if router.rank_history:
+    if router.rank_history and not ranks or ranks and not router.rank_history:
+      print "WARN: Rank storage mismatch for "+router.idhex
+      continue
+    if router.bw_history and not bws or bws and not router.bw_history:
+      print "WARN: Bw storage mismatch for "+router.idhex
+      continue
+
+    if router.rank_history and ranks:
+      if len(ranks) != len(router.rank_history):
+          print "WARN: Rank mismatch for "+router.idhex+": "+str(check_ranks(router))+" vs "+str(min_avg_max(ranks))
+          print " local: "+str(router.rank_history)
+          print " disk: "+str(ranks)
       for i,r in enumerate(ranks):
         if router.rank_history[i] != r:
           print "WARN: Rank mismatch for "+router.idhex+": "+str(check_ranks(router))+" vs "+str(min_avg_max(ranks))
+          print " local: "+str(router.rank_history)
+          print " disk: "+str(ranks)
           break
-    if router.bw_history:
-      for i,b in enumerate(bws):
-        if router.bw_history[i] != b:
+    if router.bw_history and bws:
+      if len(bws) != len(router.bw_history):
           print "WARN: Bw mismatch for "+router.idhex+": "+str(check_ranks(router))+" vs "+str(min_avg_max(ranks))
-          break
+          print " local: "+str(router.bw_history)
+          print " disk: "+str(bws)
+      else:
+        for i,b in enumerate(bws):
+          if router.bw_history[i] != b:
+            print "WARN: Bw mismatch for "+router.idhex+": "+str(check_ranks(router))+" vs "+str(min_avg_max(ranks))
+            print " local: "+str(router.bw_history)
+            print " disk: "+str(bws)
+            break
   rankfile.close()
 
   for i in xrange(0, 3):

Modified: torflow/trunk/CircuitAnalysis/BuildTimes/full_run.sh
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/full_run.sh	2009-01-22 12:17:38 UTC (rev 18224)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/full_run.sh	2009-01-22 12:21:57 UTC (rev 18225)
@@ -2,8 +2,8 @@
 
 mkdir slices
 
-./buildtimes.py -n 10000 -s 3 -e 93 -c 15 -d ./slices >& ./slices/bt-slices.log
-./buildtimes.py -n 10000 -s 3 -g -e 50 -c 30 -d ./slices >& ./slices/bt-guards.log
-./buildtimes.py -n 100000 -d slices/ -s 93 -c 100 >& ./slices/bt-all.log
+./buildtimes.py -n 5000 -s 3 -e 93 -c 20 -d ./slices >& ./slices/bt-slices.log
+./buildtimes.py -n 5000 -s 3 -g -e 50 -c 40 -d ./slices >& ./slices/bt-guards.log
+./buildtimes.py -n 20000 -d slices/ -s 93 -c 100 >& ./slices/bt-all.log
 
 mv slices slices-`date +%Y-%m-%d-%H:%M`