[tor-commits] [torperf/master] Merge branch 'task2515' into master2

[karsten@xxxxxxxxxxxxxx]

commit a7a3d12432a61f172caa8ed7b83e273afdf524d7
Merge: b240ae1 4a91835
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Fri Feb 25 07:52:15 2011 +0100

    Merge branch 'task2515' into master2

 measurements-HOWTO |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --combined measurements-HOWTO
index e72969e,089073f..ddd014b
--- a/measurements-HOWTO
+++ b/measurements-HOWTO
@@@ -119,8 -119,12 +119,12 @@@ Install the timeout tool
  $ sudo apt-get install timeout     # Lenny
  $ sudo apt-get install coreutils   # Squeeze
  
- Add crontab entries to start the regular requests (line breaks are only
- for formatting purposes here):
+ Add crontab entries to start the regular requests.
+ 
+ Note that the syntax of the timeout script in Lenny is different from the
+ one in Squeeze.  When in doubt, look up the correct syntax in the man
+ page.  For the timeout script contained in Lenny, the crontab entries
+ would be as follows (line breaks are only for formatting purposes here):
  
  $ crontab -e
  
@@@ -134,6 -138,22 +138,22 @@@
    torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data
    2>/dev/null
  
+ For the timeout script in Squeeze, use the following crontab entries (the
+ only difference is that the first command-line argument is "-s2" instead
+ of "-2"; again, line breaks for formatting purposes only):
+ 
+ $ crontab -e
+ 
+ */5 * * * * timeout -s2 295 ~/torperf/trivsocks-client
+   torperf.torproject.org 127.0.0.1:9020 /.50kbfile >> ~/torperf/50kb.data
+   2>/dev/null
+ 2,32 * * * * timeout -s2 1795 ~/torperf/trivsocks-client
+   torperf.torproject.org 127.0.0.1:9021 /.1mbfile >> ~/torperf/1mb.data
+   2>/dev/null
+ 8 * * * * timeout -s2 3595 ~/torperf/trivsocks-client
+   torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data
+   2>/dev/null
+ 
  From now on, the three files 50kb.data, 1mb.data, and 5mb.data should
  accumulate lines like this (50kb.data shown here; line breaks are only for
  formatting purposes):
@@@ -163,33 -183,26 +183,33 @@@ startsec startuse
    writebytes readbytes
  
  The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should
 -accumulate lines like this (linebreaks for formatting reasons):
 +accumulate lines with KEY=value pairs describing the following properties:
  
 -ok 1284059486 $ED16C4DD8E9BCACDE829E6B6571B58095383897A=PPrivCom030
 -  $80818E35A46DEED6889818ADC596404AB94E392A=Pandora14
 -  $4C23C8C30C66C87E1C875A949B4841E4305FFC57~Amunet11
 +CIRC_ID: The circuit id from the control port
 +LAUNCH: The launch time of the circuit
 +PATH: The identity fingerprints of the members of the path
 +BUILDTIMES: Cumulative timer of how long before each hop was completed
 +USED_AT: Closing time for the Torperf stream (should match datacomplete*sec)
 +USED_BY: Control port stream id for this Torperf stream
 +TIMEOUT: The current CircuitBuildTimeout (in ms, pre-rounding)
 +QUANTILE: The current CircuitBuildTimeout quantile cutoff
  
 -with column headers:
 +In the event of error, the following fields may be present in lieu of
 +completion data:
  
 -ok|error timestamp firsthop secondhop thirdhop [fourthhop ...]
 +FAIL_REASONS: Reasons for circuit failure
 +STREAM_FAIL_REASONS: Reasons for stream failure
  
 -The first column indicates if this circuit was actually used to fetch
 -the data or if Tor chose a different circuit because this one was
 -problematic. For every error entry there should be a following ok
 -entry, unless the network of the torperf instance is totally dead or
 -the resource it wants to fetch is unavailable.
 +The files will also contain direct copies of the control port event
 +BUILDTIMEOUT_SET. See control-spec.txt for details of this.
  
 -The timestamp will NOT necessarily match the timestamps in the .data file
 -exactly, because additional processing is necessary. You should allow
 -for up to a minute of slack when matching the two files up. See the
 -consolidate_stats.py script that fulfills this job.
 +The USED_AT timestamp will NOT necessarily match the timestamps in the .data
 +file exactly, because additional processing is necessary. The timestamp from
 +the .data files that is closest to USED_AT is "datacompletesec
 +datacompleteusec". If the times are more than a second apart, something is
 +really wrong.
 +
 +XXX: consolidate-stats needs update, and no longer works.
  
  Call it like this:
  

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits