[or-cvs] [torperf/master] Minor fixes.

[sebastian at torproject.org]

commit feec5f0b9725ca291b813fc67153356f63bd1815
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jan 26 11:56:13 2011 +0100

    Minor fixes.
---
 extra_stats.py     |    2 +-
 measurements-HOWTO |   15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/extra_stats.py b/extra_stats.py
index f0c4ad4..0431730 100644
--- a/extra_stats.py
+++ b/extra_stats.py
@@ -22,7 +22,7 @@ class WriteStats(TorCtl.PostEventListener):
   def stream_status_event(self, event):
     if event.source == 'EXIT' or \
        event.status == 'DETACHED':
-      for circs in self._conn.get_info( "circuit-status").itervalues():
+      for circs in self._conn.get_info("circuit-status").itervalues():
         for circ in circs.split("\n"):
           entry = circ.split(" ")
           if entry[0] == str(event.circ_id):
diff --git a/measurements-HOWTO b/measurements-HOWTO
index bb236b8..bd12556 100644
--- a/measurements-HOWTO
+++ b/measurements-HOWTO
@@ -74,7 +74,7 @@ CookieAuthentication 1
 EOF
 
 ControlPort is configured so that we can attach a small controller
-that is used to write additional statistics about the chosen paths
+that is used to write additional statistics about the chosen paths.
 
 Now we need to get TorCtl:
 
@@ -89,9 +89,9 @@ cd ~/torperf/torclient50kb && tor -f ~/torperf/torclient50kb/torrc
 cd ~/torperf/torclient1mb && tor -f ~/torperf/torclient1mb/torrc
 cd ~/torperf/torclient5mb && tor -f ~/torperf/torclient5mb/torrc
 sleep 5
-cd ~/torperf/torclient50kb && python ../extra_stats.py 10020 ~/torperf/50kb.extradata
-cd ~/torperf/torclient1mb && python ../extra_stats.py 10021 ~/torperf/1mb.extradata
-cd ~/torperf/torclient5mb && python ../extra_stats.py 10022 ~/torperf/5mb.extradata
+cd ~/torperf/torclient50kb && python ../extra_stats.py 10020 ../50kb.extradata
+cd ~/torperf/torclient1mb && python ../extra_stats.py 10021 ../1mb.extradata
+cd ~/torperf/torclient5mb && python ../extra_stats.py 10022 ../5mb.extradata
 EOF
 
 $ chmod a+x start-tors
@@ -156,15 +156,18 @@ with column headers:
 ok|error timestamp firsthop secondhop thirdhop [fourthhop ...]
 
 The first column indicates if this circuit was actually used to fetch
-the data or if Tor chose a different one because this one was
+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 timestamp will NOT necessarily match one from the .data file
+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.
 
+Relays are written as $fingerprint=nickname for Named relays and as
+$fingerprint~nickname for relays without the Named flag.
+
 If everything works, you might want to let your system start these Tor
 clients on system startup. On Debian, this can be done using a crontab
 entry, too: