[or-cvs] r10878: Some temporary speedracer hacks to make it work with metatro (torflow/trunk)

[mikeperry at seul.org]

Author: mikeperry
Date: 2007-07-19 04:00:53 -0400 (Thu, 19 Jul 2007)
New Revision: 10878

Modified:
   torflow/trunk/speedracer.pl
Log:

Some temporary speedracer hacks to make it work with metatroller.py



Modified: torflow/trunk/speedracer.pl
===================================================================
--- torflow/trunk/speedracer.pl	2007-07-19 07:58:47 UTC (rev 10877)
+++ torflow/trunk/speedracer.pl	2007-07-19 08:00:53 UTC (rev 10878)
@@ -17,10 +17,10 @@
 # http://bitter.stalin.se/torfile
 # http://www.sigma.su.se/~who/torfile
 my $URL = "http://bitter.stalin.se/torfile1"; 
-my $COUNT = 500;
+my $COUNT = 200;
 my $START_PCT = 0;
-my $STOP_PCT = 20;
-my $PCT_STEP = 5;
+my $STOP_PCT = 8;
+my $PCT_STEP = 4;
 my $DOUBLE_FETCH = 0;
 
 my $LOG_LEVEL = "DEBUG";
@@ -122,8 +122,8 @@
             
             $t0 = [gettimeofday()];
             $ret = 
-#                system("tsocks wget -U \"$USER_AGENT\" \'$URL\' -O - >& /dev/null");
-                system("curl $CURL_PROXY -m 600 -A \"$USER_AGENT\" \'$URL\' >& /dev/null");
+                system("tsocks wget -U \"$USER_AGENT\" \'$URL\' -O - >& /dev/null");
+#                system("curl $CURL_PROXY -m 600 -A \"$USER_AGENT\" \'$URL\' >& /dev/null");
 
             if($ret == 2) {
                 plog "NOTICE", "wget got Sigint. Dying\n";
@@ -134,7 +134,8 @@
             $delta_build = tv_interval $t0;
             plog "NOTICE", "Timer exceeded limit: $delta_build\n"
                 if($delta_build >= 550.0);
-        } while($ret != 0 || $delta_build >= 550.0);
+        } while(0);
+#        } while($ret != 0 || $delta_build >= 550.0);
 
         $build_exit = query_exit($mcp);
         $fetch_exit = $build_exit;
@@ -147,8 +148,8 @@
                 $i++;
                 $t0 = [gettimeofday()];
                 $ret = 
-#                system("tsocks wget -U \"$USER_AGENT\" \'$URL\' -O - >& /dev/null");
-                    system("curl $CURL_PROXY -m 600 -A \"$USER_AGENT\" \'$URL\' >& /dev/null");
+                system("tsocks wget -U \"$USER_AGENT\" \'$URL\' -O - >& /dev/null");
+#                    system("curl $CURL_PROXY -m 600 -A \"$USER_AGENT\" \'$URL\' >& /dev/null");
 
                 if($ret == 2) {
                     plog "NOTICE", "wget got Sigint. Dying\n";