[or-cvs] r18086: {torctl torflow} Taking my advice :) (torctl/trunk/python/TorCtl torflow/trunk/CircuitAnalysis/BuildTimes)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-01-12 00:34:32 -0500 (Mon, 12 Jan 2009)
New Revision: 18086

Modified:
   torctl/trunk/python/TorCtl/PathSupport.py
   torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py
Log:

Taking my advice :)



Modified: torctl/trunk/python/TorCtl/PathSupport.py
===================================================================
--- torctl/trunk/python/TorCtl/PathSupport.py	2009-01-12 05:29:26 UTC (rev 18085)
+++ torctl/trunk/python/TorCtl/PathSupport.py	2009-01-12 05:34:32 UTC (rev 18086)
@@ -1034,7 +1034,7 @@
       if not "Running" in ns.flags:
         if ns.idhex in self.routers:
           plog("DEBUG", "Expiring non-running router "+ns.idhex)
-          self.sorted_r.remove(elf.routers[ns.idhex])
+          self.sorted_r.remove(self.routers[ns.idhex])
           del self.routers[ns.idhex]
 
     nslist = filter(lambda ns: "Running" in ns.flags, nslist)
@@ -1630,7 +1630,7 @@
       flag += "E"
     if "Guard" in r.flags:
       flag += "G"
-    print str(r.list_rank)+". "+r.nickname+" "+str(r.bw/1024)+"/"+str(bw/1024)+": "+str(r.chosen)+", "+flag
+    print str(r.list_rank)+". "+r.nickname+" "+str(r.bw/1024.0)+"/"+str(bw/1024.0)+": "+str(r.chosen)+", "+flag
     i += 1
     if i > num_print: break
 

Modified: torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py
===================================================================
--- torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py	2009-01-12 05:29:26 UTC (rev 18085)
+++ torflow/trunk/CircuitAnalysis/BuildTimes/buildtimes.py	2009-01-12 05:34:32 UTC (rev 18086)
@@ -18,6 +18,7 @@
 from TorCtl.StatsSupport import StatsHandler
 from TorCtl import PathSupport, TorCtl
 from TorCtl.PathSupport import ExitPolicyRestriction,OrNodeRestriction
+from TorCtl.TorUtil import plog
 
 # Note: It is not recommended to set order_exits to True, because
 # of the lifetime differences between this __selmgr and the