[or-cvs] [metrics-web/master] Add new torperf results to data page.

[karsten@xxxxxxxxxxxxxx]

commit 9347ffa78da9b5af03cf7857bf4d7bda5303f317
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Wed Feb 2 14:33:12 2011 +0100

    Add new torperf results to data page.
---
 .../torproject/ernie/web/ResearchDataServlet.java  |   10 ++++++++++
 web/WEB-INF/data.jsp                               |   11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java
index 0c8efce..2d45c0f 100644
--- a/src/org/torproject/ernie/web/ResearchDataServlet.java
+++ b/src/org/torproject/ernie/web/ResearchDataServlet.java
@@ -76,6 +76,13 @@ public class ResearchDataServlet extends HttpServlet {
         new TreeMap<String, Map<String, String[]>>();
     SortedMap<Date, String[]> exitLists = new TreeMap<Date, String[]>();
 
+    /* Prepare rewriting Torperf sources. */
+    Map<String, String> torperfSources = new HashMap<String, String>();
+    torperfSources.put("torperffast", "torperf, fastest");
+    torperfSources.put("torperffastratio", "torperf, best ratio");
+    torperfSources.put("torperfslow", "torperf, slowest");
+    torperfSources.put("torperfslowratio", "torperf, worst ratio");
+
     /* Go through the file list, decide for each file what metrics data
      * type it is, and put it in the appropriate map. */
     SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM");
@@ -168,6 +175,9 @@ public class ResearchDataServlet extends HttpServlet {
           continue;
         }
         String source = parts[0];
+        if (torperfSources.containsKey(source)) {
+          source = torperfSources.get(source);
+        }
         String filesize = parts[1];
         filesize = filesize.substring(0, filesize.length()
             - (isExtraData ? 10 : 5));
diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp
index 7d660e0..86028c2 100644
--- a/web/WEB-INF/data.jsp
+++ b/web/WEB-INF/data.jsp
@@ -179,8 +179,15 @@
         <br>
         <p>We are measuring the performance of the Tor network by
         periodically requesting files of different sizes and recording the
-        time needed to do so. The files below contain the output of the
-        torperf application and are updated every hour:</p>
+        time needed to do so. The main measurements on moria, siv, and
+        torperf use an unmodified Tor client. The four additional setups
+        on torperf are configured to pick their guard nodes from sets of
+        the a) absolute fastest, b) absolute slowest, c) best rated vs.
+        advertised ratio or d) worst rated vs. advertised ratio nodes. The
+        ratio mechanisms provide a way to select the nodes that the
+        bandwidth authorities think stand out in their measurement. The
+        files below contain the output of the torperf application and are
+        updated every hour:</p>
         <table width="100%" border="0" cellpadding="5" cellspacing="0" summary="">
           <c:forEach var="item" items="${torperfData}" >
             <tr>