[or-cvs] r19537: {torflow} Remove StatsSupport usage from metatroller and speedracer. I (in torflow/trunk: . NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-05-19 05:56:36 -0400 (Tue, 19 May 2009)
New Revision: 19537

Modified:
   torflow/trunk/NetworkScanners/speedracer.py
   torflow/trunk/metatroller.py
Log:

Remove StatsSupport usage from metatroller and speedracer. It
sucks up gobs of memory we don't need to use. Use SQL instead.



Modified: torflow/trunk/NetworkScanners/speedracer.py
===================================================================
--- torflow/trunk/NetworkScanners/speedracer.py	2009-05-19 09:55:10 UTC (rev 19536)
+++ torflow/trunk/NetworkScanners/speedracer.py	2009-05-19 09:56:36 UTC (rev 19537)
@@ -129,8 +129,8 @@
         if ret and successful and (successful % save_every) == 0:
           race_time = strftime("20%y-%m-%d-%H:%M:%S")
           meta.send_command_and_check('CLOSEALLCIRCS')
-          meta.send_command_and_check('SAVESTATS '+os.getcwd()+'/data/speedraces/stats-'+str(skip)+':'+str(pct)+"-"+str(successful)+"-"+race_time)
-          meta.send_command_and_check('SAVERATIOS '+os.getcwd()+'/data/speedraces/ratios-'+str(skip)+':'+str(pct)+"-"+str(successful)+"-"+race_time)
+#          meta.send_command_and_check('SAVESTATS '+os.getcwd()+'/data/speedraces/stats-'+str(skip)+':'+str(pct)+"-"+str(successful)+"-"+race_time)
+#          meta.send_command_and_check('SAVERATIOS '+os.getcwd()+'/data/speedraces/ratios-'+str(skip)+':'+str(pct)+"-"+str(successful)+"-"+race_time)
           meta.send_command_and_check('SAVESQL '+os.getcwd()+'/data/speedraces/sql-'+str(skip)+':'+str(pct)+"-"+str(successful)+"-"+race_time)
           meta.send_command_and_check('COMMIT')
 
@@ -178,8 +178,8 @@
 
           plog('DEBUG', 'speedroced')
           meta.send_command_and_check('CLOSEALLCIRCS')
-          meta.send_command_and_check('SAVESTATS '+os.getcwd()+'/data/speedraces/stats-'+str(pct) + ':' + str(pct + pct_step)+"-"+str(count)+"-"+strftime("20%y-%m-%d-%H:%M:%S"))
-          meta.send_command_and_check('SAVERATIOS '+os.getcwd()+'/data/speedraces/ratios-'+str(pct) + ':' + str(pct + pct_step)+"-"+str(count)+"-"+strftime("20%y-%m-%d-%H:%M:%S"))
+#          meta.send_command_and_check('SAVESTATS '+os.getcwd()+'/data/speedraces/stats-'+str(pct) + ':' + str(pct + pct_step)+"-"+str(count)+"-"+strftime("20%y-%m-%d-%H:%M:%S"))
+#          meta.send_command_and_check('SAVERATIOS '+os.getcwd()+'/data/speedraces/ratios-'+str(pct) + ':' + str(pct + pct_step)+"-"+str(count)+"-"+strftime("20%y-%m-%d-%H:%M:%S"))
           meta.send_command_and_check('SAVESQL '+os.getcwd()+'/data/speedraces/sql-'+str(pct) + ':' + str(pct + pct_step)+"-"+str(count)+"-"+strftime("20%y-%m-%d-%H:%M:%S"))
           plog('DEBUG', 'Wrote stats')
           pct += pct_step

Modified: torflow/trunk/metatroller.py
===================================================================
--- torflow/trunk/metatroller.py	2009-05-19 09:55:10 UTC (rev 19536)
+++ torflow/trunk/metatroller.py	2009-05-19 09:56:36 UTC (rev 19537)
@@ -31,11 +31,11 @@
 import math
 #from TorCtl import *
 
-from TorCtl import TorUtil, PathSupport, TorCtl, StatsSupport
+from TorCtl import TorUtil, PathSupport, TorCtl #, StatsSupport
 from TorCtl.TorUtil import *
 from TorCtl.PathSupport import *
 from TorCtl.TorUtil import meta_port, meta_host, control_port, control_host, control_pass
-from TorCtl.StatsSupport import StatsHandler,StatsRouter
+#from TorCtl.StatsSupport import StatsHandler,StatsRouter
 
 mt_version = "0.1.0-dev"
 max_detach = 3
@@ -269,7 +269,7 @@
       s.write("250 OK\r\n")
     elif command == "RESETSTATS":
       plog("DEBUG", "Got resetstats")
-      def notlambda(this): this.reset_stats()
+      def notlambda(this): this.reset()
       h.schedule_low_prio(notlambda)
       s.write("250 OK\r\n")
     elif command == "COMMIT":
@@ -310,7 +310,7 @@
   c = PathSupport.Connection(s)
   c.debug(file("control.log", "w", buffering=0))
   c.authenticate(control_pass)
-  h = StatsHandler(c, __selmgr)
+  h = PathSupport.PathBuilder(c, __selmgr) # StatsHandler(c, __selmgr)
 
   c.set_event_handler(h)