- tor-commits - lists.torproject.org

[arm/packaging] Adding python 2.5 and hashlib dependency for rpm
by atagar＠torproject.org 02 Nov '11

02 Nov '11

commit e0b4488f2f9bbe592bf1d82fef72ccb2a9b390dc Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 2 08:55:04 2011 -0700 Adding python 2.5 and hashlib dependency for rpm CentOS and RHEL5 come with python 2.4 so adding a requirement on 2.5 to avoid nasty surprises. Caught by Juan Orti Alcaine and unSpawn. --- build/redhat/make-rpm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build/redhat/make-rpm b/build/redhat/make-rpm index 0e8cae1..0176f0b 100755 --- a/build/redhat/make-rpm +++ b/build/redhat/make-rpm @@ -1,6 +1,6 @@ #!/bin/sh cp redhat/MANIFEST ./ -python setup.py bdist_rpm +python setup.py bdist_rpm --requires="python-2.5, python-hashlib" # cleans up after rpm build files="build MANIFEST"

1 0

[metrics-web/master] Add Roger's "Ten ways to discover Tor bridges" blog post.
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit 9be23e4454faadfc8dd5b6c071e3f4506a2420fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 2 13:11:23 2011 +0100 Add Roger's "Ten ways to discover Tor bridges" blog post. --- web/WEB-INF/papers.jsp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/papers.jsp b/web/WEB-INF/papers.jsp index 02710c9..ecc92fb 100644 --- a/web/WEB-INF/papers.jsp +++ b/web/WEB-INF/papers.jsp @@ -108,6 +108,9 @@ research or describe new interesting research questions that can (partly) be answered with metrics data. <ul> + <li>Research problems: Ten ways to discover Tor bridges + (<a href="https://blog.torproject.org/blog/research-problems-ten-ways-discover-tor-br…">link</a>, + October 31, 2011).</li> <li>Research problem: better guard rotation parameters (<a href="https://blog.torproject.org/blog/research-problem-better-guard-rotation-par…">link</a>, August 20, 2011).</li>

1 0

[metrics-web/master] Add anchors and links to <h3>'s.
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit accf50eba89e4f99874d50a3f386a6815e76172a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 2 12:35:10 2011 +0100 Add anchors and links to <h3>'s. --- src/org/torproject/chc/MetricsWebsiteReport.java | 44 ++++++++++++++++----- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/chc/MetricsWebsiteReport.java b/src/org/torproject/chc/MetricsWebsiteReport.java index 8744c8b..e1adc57 100644 --- a/src/org/torproject/chc/MetricsWebsiteReport.java +++ b/src/org/torproject/chc/MetricsWebsiteReport.java @@ -128,7 +128,9 @@ public class MetricsWebsiteReport implements Report { /* Write the valid-after time of the downloaded consensus. */ private void writeValidAfterTime() throws IOException { this.bw.write(" <br>\n" - + " <h3>Valid-after time</h3>\n" + + " <a name=\"validafter\">\n" + + " <h3><a href=\"#validafter\" class=\"anchor\">" + + "Valid-after time</a></h3>\n" + " <br>\n" + " <p>Consensus was published "); if (this.downloadedConsensus.getValidAfterMillis() < @@ -147,7 +149,9 @@ public class MetricsWebsiteReport implements Report { /* Write the lists of known flags. */ private void writeKnownFlags() throws IOException { this.bw.write(" <br>\n" - + " <h3>Known flags</h3>\n" + + " <a name=\"knownflags\">\n" + + " <h3><a href=\"#knownflags\" class=\"anchor\">Known " + + "flags</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -184,7 +188,9 @@ public class MetricsWebsiteReport implements Report { /* Write the number of relays voted about. */ private void writeNumberOfRelaysVotedAbout() throws IOException { this.bw.write(" <br>\n" - + " <h3>Number of relays voted about</h3>\n" + + " <a name=\"numberofrelays\">\n" + + " <h3><a href=\"#numberofrelays\" class=\"anchor\">" + + "Number of relays voted about</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -224,7 +230,9 @@ public class MetricsWebsiteReport implements Report { * the resulting consensus method. */ private void writeConsensusMethods() throws IOException { this.bw.write(" <br>\n" - + " <h3>Consensus methods</h3>\n" + + " <a name=\"consensusmethods\">\n" + + " <h3><a href=\"#consensusmethods\" class=\"anchor\">" + + "Consensus methods</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -275,7 +283,9 @@ public class MetricsWebsiteReport implements Report { /* Write recommended versions. */ private void writeRecommendedVersions() throws IOException { this.bw.write(" <br>\n" - + " <h3>Recommended versions</h3>\n" + + " <a name=\"recommendedversions\">\n" + + " <h3><a href=\"#recommendedversions\" class=\"anchor\">" + + "Recommended versions</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -370,7 +380,9 @@ public class MetricsWebsiteReport implements Report { /* Write consensus parameters. */ private void writeConsensusParameters() throws IOException { this.bw.write(" <br>\n" - + " <h3>Consensus parameters</h3>\n" + + " <a name=\"consensusparams\">\n" + + " <h3><a href=\"#consensusparams\" class=\"anchor\">" + + "Consensus parameters</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -444,7 +456,9 @@ public class MetricsWebsiteReport implements Report { /* Write authority keys and their expiration dates. */ private void writeAuthorityKeys() throws IOException { this.bw.write(" <br>\n" - + " <h3>Authority keys</h3>\n" + + " <a name=\"authoritykeys\">\n" + + " <h3><a href=\"#authoritykeys\" class=\"anchor\">" + + "Authority keys</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -487,7 +501,9 @@ public class MetricsWebsiteReport implements Report { * in votes. */ private void writeBandwidthScannerStatus() throws IOException { this.bw.write(" <br>\n" - + " <h3>Bandwidth scanner status</h3>\n" + + " <a name=\"bwauthstatus\">\n" + + " <h3><a href=\"#bwauthstatus\" class=\"anchor\">" + + "Bandwidth scanner status</a></h3>\n" + " <br>\n" + " <table border=\"0\" cellpadding=\"4\" " + "cellspacing=\"0\" summary=\"\">\n" @@ -514,7 +530,9 @@ public class MetricsWebsiteReport implements Report { /* Write directory authority versions. */ private void writeAuthorityVersions() throws IOException { this.bw.write(" <br>\n" - + " <h3>Authority versions</h3>\n" + + " <a name=\"authorityversions\">\n" + + " <h3><a href=\"#authorityversions\" class=\"anchor\">" + + "Authority versions</a></h3>\n" + " <br>\n"); Map<String, String> authorityVersions = this.downloadedConsensus.getAuthorityVersions(); @@ -548,7 +566,9 @@ public class MetricsWebsiteReport implements Report { * the consensus for each relay. */ private void writeRelayFlagsTable() throws IOException { this.bw.write(" <br>\n" - + " <h3>Relay flags</h3>\n" + + " <a name=\"relayflags\">\n" + + " <h3><a href=\"#relayflags\" class=\"anchor\">Relay " + + "flags</a></h3>\n" + " <br>\n" + " <p>The semantics of flags written in the table is " + "as follows:</p>\n" @@ -695,7 +715,9 @@ public class MetricsWebsiteReport implements Report { /* Write the relay flag summary. */ private void writeRelayFlagsSummary() throws IOException { this.bw.write(" <br>\n" - + " <h3>Overlap between votes and consensus</h3>\n" + + " <a name=\"overlap\">\n" + + " <h3><a href=\"#overlap\" class=\"anchor\">Overlap " + + "between votes and consensus</a></h3>\n" + " <br>\n" + " <p>The semantics of columns is similar to the " + "table above:</p>\n"

1 0

[metrics-web/master] Remove unused CSS selectors
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit d596d8632ae00d0e16d74dc53b0ee8ac35f1a9e4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 2 10:51:42 2011 +0100 Remove unused CSS selectors --- web/css/stylesheet-ltr.css | 361 -------------------------------------------- 1 files changed, 0 insertions(+), 361 deletions(-) diff --git a/web/css/stylesheet-ltr.css b/web/css/stylesheet-ltr.css index ca49f90..ce0c54e 100644 --- a/web/css/stylesheet-ltr.css +++ b/web/css/stylesheet-ltr.css @@ -34,39 +34,6 @@ li { text-align: left; } -/* for the shadow box */ - -table.shadowbox { - width: 788px; - border-collapse: collapse; - padding: 0; - margin-bottom: 2em; -} - -table.shadowbox td { - margin: 0; - padding: 0; -} - -/* spacer */ - -td.spacer { - width: 110px; -} - -div.banner { - text-align: center; - height: 79px; - margin-bottom: 10px; - width:100%; -} - -table.table-banner { - margin: 0 auto 0 auto; - background-image: url("images/tor_mast.gif"); - background-repeat: no-repeat; -} - div.bottom { font-size: 0.8em; margin-top: 0.5cm; @@ -75,32 +42,6 @@ div.bottom { text-align: center; } -/* the sidebars */ - -div.sidebar { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - background-color: #e5e5e5; - float: right; - margin: 0 0 10px 10px; - /* border: 2px solid #666; */ - padding: 10px; - width: 150px; - text-align: center; -} - -div.sidebar-left { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - background-color: #e5e5e5; - float: right; - margin: 0 0 5px 5px; - /* border: 2px solid #666; */ - padding: 5px; - width: 275px; - text-align: left; -} - /* The main column (left text) */ div.main-column { @@ -113,11 +54,6 @@ div.main-column { /* formatting styles */ -h1 { - font-size: 1.6em; - margin-bottom: 0.5em; -} - h2 { font-size: 1.4em; margin-bottom: 0em; @@ -132,20 +68,6 @@ h3 { margin-top: 0; } -h4 { - font-size: 1.1em; - margin-bottom: 0em; - font-weight: bold; - margin-top: 0; -} - -h5 { - font-size: 1.0em; - margin-bottom: 0em; - font-weight: bold; - margin-top: 0; -} - p { margin-top: 0; margin-bottom: 1em; @@ -161,20 +83,6 @@ a:visited { font-size: 1em; } -a.anchor:link { - font-size: 1em; - color: black; - font-weight: bold; - text-decoration: none; -} - -a.anchor:visited { - font-size: 1em; - color: black; - font-weight: bold; - text-decoration: none; -} - a.anchor { font-size: 1em; color: black; @@ -186,10 +94,6 @@ td { vertical-align: top; } -a.smalllink { - font-size: 0.8em; -} - /* the banner */ table.banner { @@ -247,195 +151,6 @@ td.banner-right { left: -50px; } -.donatebutton { - width: auto; - text-align: center; -} - -.donatebutton a { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - margin: 10px 0 0 0; - font-weight: bold; - display: block; - padding: 6px; - background-color: #00802B; - border-top: 1px solid #00A838; - border-left: 1px solid #00A838; - border-bottom: 1px solid #00591E; - border-right: 1px solid #00591E; - color: #FFFFFF; -} - -.donatebutton a:hover { - color: orange; -} - -.donatebutton a:active { - color: orange; -} - -.downloadbutton { - width: auto; - text-align: center; -} - -.downloadbutton a { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - margin: 10px 0 0 0; - font-weight: bold; - display: block; - padding: 6px; - background-color: orange; - color: #FFFFFF; -} - -.downloadbutton a:hover { - color: green; -} - -.donatebutton a:active { - color: green; -} - -/* these styles are for the menu on the gui contest pages */ - -.guileft { - width: 25%; - float: left; - padding: 0; - margin: 0; -} - -.guimenu { - border: 1px solid #AAA6AB; - background-color: #E2DFE3; - margin: 0 15px 15px 0; - padding: 0; -} - -.guimenuinner a { - display: block; - text-decoration: none; - padding: 2px 0px 0px 12px; - margin: 0 0 0 0px; - color: #333333; -} - -.guimenuinner a:visited { - color: #333333; -} - -.guimenuinner a:hover { - background-image: url(gui/img/arrow.png); - background-repeat: no-repeat; - background-position: left; - color: #EF8012; -} - -.guimenuinner a.on { - background-image: url(gui/img/arrow.png); - background-repeat: no-repeat; - background-position: left; - color: #EF8012; -} - - -.guimenu h1 { - width: 85%; - font-size: 16px; - margin: 0 0 8px 0; - padding: 0; - border-bottom: 1px solid #AAA6AB; -} - -.curveleft { - background-image: url(gui/img/corner-topleft.png); - background-repeat: no-repeat; - background-position: top left; - margin: -1px; -} - -.curveright { - background-image: url(gui/img/corner-topright.png); - background-repeat: no-repeat; - background-position: top right; -} - -.guimenuinner { - - padding: 0 10px 0 10px; -} - - -.curvebottomleft { - background-image: url(gui/img/corner-bottomleft.png); - background-repeat: no-repeat; - background-position: bottom left; - margin: -1px; -} - -.curvebottomright { - background-image: url(gui/img/corner-bottomright.png); - background-repeat: no-repeat; - background-position: bottom right; -} - -table.mirrors { - margin: 0 auto; - border-width: 3px; - border-color: gray; - border-style: ridge; - border-collapse: collapse; -} -table.mirrors th { - border: 1px solid gray; - background-color: #DDDDDD; -} -table.mirrors td { - border: 1px solid gray; - padding: 4px; -} - -acronym { - border-bottom: none; -} - -dt { - font-weight: bolder; - font-style: italic; -} - -.nb { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - background-color:#EEEEFF; - border:1px solid #000000; - color:black; - font-size:10pt; - font-weight:bold; - margin:10px 0; - padding:15px 20px; - text-align:justify; -} - -.warning { - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - background-color:#FFFFFF; - background-image:url(/images/distros/warning.png); - background-position:15px center; - background-repeat:no-repeat; - border:2px solid #FF0000; - color:#1A1A1A; - font-size:10pt; - font-weight:bold; - margin:10px 0; - padding:15px 20px 15px 67px; - text-align:justify; -} - hr { background-color:#002200; color:#666666; @@ -444,79 +159,3 @@ hr { line-height:0; margin:15px 0 5px; } - -.underline { - border-bottom:1px solid #000022; - margin:10px 0 20px; - padding:5px 0; -} - -div#graphmenu { - float:left; - margin-top:20px; - width:100%; - padding:5px; -} - -#graphmenu div.formrow { - clear:both; -} - -#graphmenu .formrow p { - float:left; -} - -#graphmenu .formrow label { - float:left; - width:100px; - margin:0px 5px 0px 0px; - text-align:right; -} - -#graphmenu .formrow label.graphname { - float:left; - width:100px; - margin:0px; - text-align:right; -} - -#graphmenu .formrow label.startend { - width:50px; - margin:0px 10px 0px 0px; - text-align:right; -} - -#graphmenu .formrow input { - float:left;width:100px; -} - -#graphmenu .formrow input.submit { - width:100px; - margin:0px 0px 0px 10px; -} - -#graphmenu .break { - clear:both; -} - -#graphmenu .note { - float:left; - font-size:.8em; - font-style:italic; -} - -#graphmenu div#torperfopts { - float:left; -} - -#graphmenu div#gettoropts { - float:left; -} - -#graphmenu div#regularopts { - float:left; -} - -.error { - color:red; -}

1 0

[metrics-web/master] Add links to the remaining anchors.
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit d5a5fa311385bb4b0f8572a13f41b26fca0473cf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 2 10:17:07 2011 +0100 Add links to the remaining anchors. --- web/WEB-INF/data.jsp | 14 +++++++++----- web/WEB-INF/formats.jsp | 30 +++++++++++++++++------------- web/WEB-INF/papers.jsp | 7 ++++--- web/WEB-INF/tools.jsp | 14 ++++++++------ 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index 1cccf2c..8a062b0 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -33,7 +33,8 @@ </ul> <br> <a name="relaydesc"></a> - <h3>Relay descriptor archives</h3> + <h3><a href="#relaydesc" class="anchor">Relay descriptor + archives</a></h3> <br> <p>The relay descriptor archives contain all documents that the directory authorities make available about the network of relays. @@ -123,7 +124,8 @@ </c:if> <br> <a name="bridgedesc"></a> - <h3>Bridge descriptor archives</h3> + <h3><a href="#bridgedesc" class="anchor">Bridge descriptor + archives</a></h3> <br> <p>The bridge descriptor archives contain similar documents as the relay descriptor archives, but for the non-public bridges. The @@ -153,7 +155,8 @@ <p></p> <br> <a name="bridgeassignments"></a> - <h3>Bridge pool assignments</h3> + <h3><a href="#bridgeassignments" class="anchor">Bridge pool + assignments</a></h3> <br> <p>BridgeDB periodically dumps the list of running bridges with information about the rings, subrings, and file buckets to which @@ -175,7 +178,8 @@ </table> <br> <a name="performance"></a> - <h3>Performance data</h3> + <h3><a href="#performance" class="anchor">Performance + data</a></h3> <br> <p>We are continuously measuring the performance of the Tor network by periodically requesting files of different sizes and @@ -242,7 +246,7 @@ </table> <br> <a name="exitlist"></a> - <h3>Exit lists</h3> + <h3><a href="#exitlist" class="anchor">Exit lists</a></h3> <br> <p>We are archiving the bulk exit lists used by <a href="https://check.torproject.org/">Tor Check</a> diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 31078c0..bf2cb36 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -54,7 +54,8 @@ and is very likely more recent than the report. <br> <a name="serverdesc"></a> -<h3>Server descriptors and network statuses</h3> +<h3><a href="#serverdesc" class="anchor">Server descriptors and network +statuses</a></h3> <br> <p> Relays in the Tor network report their capabilities by publishing server @@ -257,7 +258,8 @@ addresses.</li> <br> <a name="bridgedesc"></a> -<h3>Sanitized bridge descriptors</h3> +<h3><a href="#bridgedesc" class="anchor">Sanitized bridge +descriptors</a></h3> <br> Bridges in the Tor network publish server descriptors to the bridge authority which in turn generates a bridge network status. @@ -351,7 +353,7 @@ For more details about this process, see the <br> <a name="bytehist"></a> -<h3>Byte histories</h3> +<h3><a href="#bytehist" class="anchor">Byte histories</a></h3> <br> <p> Relays include aggregate statistics in their descriptors that they upload @@ -412,7 +414,7 @@ specification</a>. <br> <a name="dirreqstats"></a> -<h3>Directory requests</h3> +<h3><a href="#dirreqstats" class="anchor">Directory requests</a></h3> <br> <p> The directory authorities and directory mirrors report statistical data @@ -485,7 +487,7 @@ specification</a>. <br> <a name="entrystats"></a> -<h3>Connecting clients</h3> +<h3><a href="#entrystats" class="anchor">Connecting clients</a></h3> <br> <p> Relays can be configured to report per-country statistics on directly @@ -505,7 +507,7 @@ specification</a>. <br> <a name="bridgestats"></a> -<h3>Bridge users</h3> +<h3><a href="#bridgestats" class="anchor">Bridge users</a></h3> <br> <p> Bridges report statistics on connecting bridge clients in their extra-info @@ -543,7 +545,7 @@ specification</a>. <br> <a name="cellstats"></a> -<h3>Cell-queue statistics</h3> +<h3><a href="#cellstats" class="anchor">Cell-queue statistics</a></h3> <br> <p> Relays can be configured to report aggregate statistics on their cell @@ -578,7 +580,7 @@ specification</a>. <br> <a name="exitstats"></a> -<h3>Exit-port statistics</h3> +<h3><a href="#exitstats" class="anchor">Exit-port statistics</a></h3> <br> <p> Exit relays running Tor version 0.2.1.1-alpha or higher can be configured @@ -600,7 +602,8 @@ specification</a>. <br> <a name="bidistats"></a> -<h3>Bidirectional connection use</h3> +<h3><a href="#bidistats" class="anchor">Bidirectional connection +use</a></h3> <br> <p> Relays running Tor version 0.2.3.1-alpha or higher can be configured to @@ -637,7 +640,7 @@ by relay <tt>zweifaltigkeit</tt>:</i> <br> <a name="torperf"></a> -<h3>Torperf output files</h3> +<h3><a href="#torperf" class="anchor">Torperf output files</a></h3> <br> <p> Torperf is a little tool that measures Tor's performance as users @@ -711,7 +714,8 @@ file (reformatted and annotated with comments):</i> <br> <a name="bridgepool"></a> -<h3>BridgeDB pool assignment files</h3> +<h3><a href="#bridgepool" class="anchor">BridgeDB pool assignment +files</a></h3> <br> <p> BridgeDB is the software that receives bridge network statuses containing @@ -770,7 +774,7 @@ OR port or relay flag which is defined by <tt>port=$port</tt> and/or <br> <a name="gettor"></a> -<h3>GetTor statistics file</h3> +<h3><a href="#gettor" class="anchor">GetTor statistics file</a></h3> <br> <p> GetTor allows users to fetch the Tor software via email. @@ -806,7 +810,7 @@ tor-im-browser-bundle_ru:0 tor-im-browser-bundle_zh_CN:0</tt> <br> <a name="exitlist"> -<h3>Tor Check exit lists</h3> +<h3><a href="#exitlist" class="anchor">Tor Check exit lists</a></h3> <br> <p> <a href="https://www.torproject.org/tordnsel/dist/">TorDNSEL</a> is an diff --git a/web/WEB-INF/papers.jsp b/web/WEB-INF/papers.jsp index ba8eb9f..02710c9 100644 --- a/web/WEB-INF/papers.jsp +++ b/web/WEB-INF/papers.jsp @@ -19,7 +19,7 @@ Metrics Project.</p> <br> <a name="papers"></a> - <h3>Papers</h3> + <h3><a href="#papers" class="anchor">Papers</a></h3> <br> These papers summarize some of the results of of the Tor Metrics Project and have been accepted for publication at academic @@ -37,7 +37,8 @@ </ul> <br> <a name="techreports"></a> - <h3>Technical reports</h3> + <h3><a href="#techreports" class="anchor">Technical + reports</a></h3> <br> The technical reports listed here have been the first place to publish novel kinds of statistics on the Tor network. Some, but @@ -101,7 +102,7 @@ </ul> <br> <a name="blogposts"></a> - <h3>Blog posts</h3> + <h3><a href="#blogposts" class="anchor">Blog posts</a></h3> <br> The following blog posts are either the results of metrics research or describe new interesting research questions that can diff --git a/web/WEB-INF/tools.jsp b/web/WEB-INF/tools.jsp index f4fd539..d19b8af 100644 --- a/web/WEB-INF/tools.jsp +++ b/web/WEB-INF/tools.jsp @@ -26,7 +26,8 @@ </ul> <br> <a name="metrics-db"></a> - <h3>Metrics data processor</h3> + <h3><a href="#metrics-db" class="anchor">Metrics data + processor</a></h3> <br> <p>The metrics data processor is a Java application that parses Tor's directory data and the data from various other Tor services, @@ -41,7 +42,7 @@ </ul> <br> <a name="metrics-web"></a> - <h3>Metrics website</h3> + <h3><a href="#metrics-web" class="anchor">Metrics website</a></h3> <br> <p>The metrics website software consists of a Java database importer and Tomcat application that makes Tor's directory data @@ -58,7 +59,8 @@ </ul> <br> <a name="dirarch"></a> - <h3>Directory-archive script</h3> + <h3><a href="#dirarch" class="anchor">Directory-archive + script</a></h3> <br> <p>The directory-archive script consists of a bunch of shell scripts that periodically download relay descriptors, sort them @@ -78,7 +80,7 @@ </ul> <br> <a name="torperf"></a> - <h3>Torperf</h3> + <h3><a href="#torperf" class="anchor">Torperf</a></h3> <br> <p>Torperf is a little tool that measures Tor's performance as users experience it. Torperf uses a trivial SOCKS client to @@ -93,7 +95,7 @@ </ul> <br> <a name="exonerator"></a> - <h3>ExoneraTor</h3> + <h3><a href="#exonerator" class="anchor">ExoneraTor</a></h3> <br> <p>ExoneraTor parses the relay descriptor archives to answer the question whether some IP address was a Tor relay. This script is @@ -109,7 +111,7 @@ </ul> <br> <a name="visitor"></a> - <h3>VisiTor</h3> + <h3><a href="#visitor" class="anchor">VisiTor</a></h3> <br> <p>VisiTor is a script that parses a web server log and the exit list archives to tell how many of the requests come from Tor

1 0

[metrics-web/master] Turn <h3> headers into links and move anchors above them.
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit 40fdc07c251eb2a954f898737be60edc39c58b0a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 2 09:34:13 2011 +0100 Turn <h3> headers into links and move anchors above them. Enhancement and implementation suggested by web guru Sebastian. --- web/WEB-INF/network.jsp | 37 +++++++++++++++++++++---------------- web/WEB-INF/packages.jsp | 4 ++-- web/WEB-INF/performance.jsp | 15 +++++++++------ web/WEB-INF/users.jsp | 9 +++++---- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 9d83cf1..dc7facc 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -15,11 +15,12 @@ <div class="main-column"> <h2>Tor Metrics Portal: Network</h2> <br> -<h3>Relays and bridges in the network</h3> +<a name="networksize"></a> +<h3><a href="#networksize" class="anchor">Relays and bridges in the +network</a></h3> <br> <p>The following graph shows the average daily number of relays and bridges in the network.</p> -<a name="networksize"></a> <img src="networksize.png${networksize_url}" width="576" height="360" alt="Network size graph"> <form action="network.html#networksize"> @@ -46,11 +47,11 @@ bridges in the network.</p> <p><a href="csv/networksize.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays by country</h3> +<a name="relaycountries"></a> +<h3><a href="#relaycountries" class="anchor">Relays by country</a></h3> <br> <p>The following graph shows the average daily number of relays by country.</p> -<a name="relaycountries"></a> <img src="relaycountries.png${relaycountries_url}" width="576" height="360" alt="Relay countries graph"> <form action="network.html#relaycountries"> @@ -84,12 +85,13 @@ country.</p> <p><a href="csv/relaycountries.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays with Exit, Fast, Guard, and Stable flags</h3> +<a name="relayflags"></a> +<h3><a href="#relayflags" class="anchor">Relays with Exit, Fast, Guard, +and Stable flags</a></h3> <br> <p>The directory authorities assign certain flags to relays that clients use for their path selection decisions. The following graph shows the average number of relays with these flags assigned.</p> -<a name="relayflags"></a> <img src="relayflags.png${relayflags_url}" width="576" height="360" alt="Relay flags graph"> <form action="network.html#relayflags"> @@ -127,7 +129,8 @@ average number of relays with these flags assigned.</p> <p><a href="csv/relayflags.csv">CSV</a> file containing all data.</p> <br> -<h3>Relays by version</h3> +<a name="versions"></a> +<h3><a href="#versions" class="anchor">Relays by version</a></h3> <br> <p>Relays report the Tor version that they are running to the directory authorities. See the @@ -136,7 +139,6 @@ page</a> and <a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">ChangeLog file</a> to find out which Tor versions are stable and unstable. The following graph shows the number of relays by version.</p> -<a name="versions"></a> <img src="versions.png${versions_url}" width="576" height="360" alt="Relay versions graph"> <form action="network.html#versions"> @@ -165,12 +167,12 @@ The following graph shows the number of relays by version.</p> platform strings of currently running relays.</p> <br> -<h3>Relays by platform</h3> +<a name="platforms"></a> +<h3><a href="#platforms" class="anchor">Relays by platform</a></h3> <br> <p>Relays report the operating system they are running to the directory authorities. The following graph shows the number of relays by platform.</p> -<a name="platforms"></a> <img src="platforms.png${platforms_url}" width="576" height="360" alt="Relay platforms graph"> <form action="network.html#platforms"> @@ -199,13 +201,14 @@ platform.</p> platform strings of currently running relays.</p> <br> -<h3>Total relay bandwidth in the network</h3> +<a name="bandwidth"></a> +<h3><a href="#bandwidth" class="anchor">Total relay bandwidth in the +network</a></h3> <br> <p>Relays report how much bandwidth they are willing to contribute and how many bytes they have read and written in the past 24 hours. The following graph shows total advertised bandwidth and bandwidth history of all relays in the network.</p> -<a name="bandwidth"></a> <img src="bandwidth.png${bandwidth_url}" width="576" height="360" alt="Relay bandwidth graph"> <form action="network.html#bandwidth"> @@ -262,11 +265,12 @@ in the network.</p> </div> </form> -<h3>Relay bandwidth by Exit and/or Guard flags</h3> +<a name="bwhist-flags"></a> +<h3><a href="#bwhist-flags" class="anchor">Relay bandwidth by Exit and/or +Guard flags</a></h3> <br> <p>The following graph shows the relay bandwidth of all relays with the Exit and/or Guard flags assigned by the directory authorities.</p> -<a name="bwhist-flags"></a> <img src="bwhist-flags.png${bwhist_flags_url}" width="576" height="360" alt="Relay bandwidth by flags graph"> <form action="network.html#bwhist-flags"> @@ -293,14 +297,15 @@ Exit and/or Guard flags assigned by the directory authorities.</p> <p><a href="csv/bwhist-flags.csv">CSV</a> file containing all data.</p> <br> -<h3>Number of bytes spent on answering directory requests</h3> +<a name="dirbytes"></a> +<h3><a href="#dirbytes" class="anchor">Number of bytes spent on answering +directory requests</a></h3> <br> <p>Relays running on 0.2.2.15-alpha or higher report the number of bytes they spend on answering directory requests. The following graph shows total written and read bytes as well as written and read dir bytes. The dir bytes are extrapolated from those relays who report them to reflect the number of written and read dir bytes by all relays.</p> -<a name="dirbytes"></a> <img src="dirbytes.png${dirbytes_url}" width="576" height="360" alt="Dir bytes graph"> <form action="network.html#dirbytes"> diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index 9bfee70..afe5e50 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -14,12 +14,12 @@ <div class="main-column"> <h2>Tor Metrics Portal: Packages</h2> <br> -<h3>Packages requested from GetTor</h3> +<a name="gettor"></a> +<h3><a href="#gettor" class="anchor">Packages requested from GetTor</a></h3> <br> <p>GetTor allows users to fetch the Tor software via email. The following graph shows the number of packages requested from GetTor per day.</p> <p> -<a name="gettor"></a> <img src="gettor.png${gettor_url}" width="576" height="360" alt="GetTor graph"> <form action="packages.html#gettor"> diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index 095bda2..05b9bf3 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -14,13 +14,14 @@ <div class="main-column"> <h2>Tor Metrics Portal: Performance</h2> <br> -<h3>Time to download files over Tor</h3> +<a name="torperf"></a> +<h3><a href="#torperf" class="anchor">Time to download files over +Tor</a></h3> <br> <p>The following graphs show the performance of the Tor network as experienced by its users. The graphs contain the average (median) time to request files of three different sizes over Tor as well as first and third quartile of request times.</p> -<a name="torperf"></a> <img src="torperf.png${torperf_url}" width="576" height="360" alt="Torperf graph"> <form action="performance.html#torperf"> @@ -58,7 +59,9 @@ quartile of request times.</p> <p><a href="csv/torperf.csv">CSV</a> file containing all data.</p> <br> -<h3>Timeouts and failures of downloading files over Tor</h3> +<a name="torperf-failures"></a> +<h3><a href="#torperf-failures" class="anchor">Timeouts and failures of +downloading files over Tor</a></h3> <br> <p>The following graphs show the fraction of timeouts and failures of downloading files over Tor as experienced by users. @@ -66,7 +69,6 @@ A timeout occurs when a 50 KiB (1 MiB, 5 MiB) download does not complete within 4:55 minutes (29:55 minutes, 59:55 minutes). A failure occurs when the download completes, but the response is smaller than 50 KiB (1 MiB, 5 MiB).</p> -<a name="torperf-failures"></a> <img src="torperf-failures.png${torperf_failures_url}" width="576" height="360" alt="Torperf failures graph"> <form action="performance.html#torperf-failures"> @@ -104,7 +106,9 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p><a href="csv/torperf-failures.csv">CSV</a> file containing all data.</p> <br> -<h3>Fraction of connections used uni-/bidirectionally</h3> +<a name="connbidirect"></a> +<h3><a href="#connbidirect" class="anchor">Fraction of connections used +uni-/bidirectionally</a></h3> <br> <p>The following graph shows the fraction of connections that is used uni- or bi-directionally. Every 10 seconds, relays determine for every @@ -116,7 +120,6 @@ connection as "Mostly reading" or "Mostly writing," respectively. All other connections are classified as "Both reading and writing." After classifying connections, read and write counters are reset for the next 10-second interval. Statistics are aggregated over 24 hours.</p> -<a name="connbidirect"></a> <img src="connbidirect.png${connbidirect_url}" width="576" height="360" alt="Fraction of direct connections used uni-/bidirectionally"> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 5c89fe7..bdd01b4 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -16,14 +16,15 @@ <h2>Tor Metrics Portal: Users</h2> <br> -<h3>Directly connecting Tor users</h3> +<a name="direct-users"></a> +<h3><a href="#direct-users" class="anchor">Directly connecting Tor +users</a></h3> <br> <p>After being connected to the Tor network, users need to refresh their list of running relays on a regular basis. They send their requests to one out of a few hundred directory mirrors to save bandwidth of the directory authorities. The following graphs show an estimate of recurring Tor users based on the requests seen by a few dozen directory mirrors.</p> -<a name="direct-users"></a> <p><b>Daily directly connecting users:</b></p> <img src="direct-users.png${direct_users_url}" width="576" height="360" alt="Direct users graph"> @@ -132,13 +133,13 @@ Tor users (direct and bridge) per month by country.</p> daily Tor users (direct and bridge) per month by country.</p> <br> -<h3>Tor users via bridges</h3> +<a name="bridge-users"></a> +<h3><a href="#bridge-users" class="anchor">Tor users via bridges</a></h3> <br> <p>Users who cannot connect directly to the Tor network instead connect via bridges, which are non-public relays. The following graphs display an estimate of Tor users via bridges based on the unique IP addresses as seen by a few hundred bridges.</p> -<a name="bridge-users"></a> <img src="bridge-users.png${bridge_users_url}" width="576" height="360" alt="Bridge users graph"> <form action="users.html#bridge-users">

1 0

[metrics-web/master] Detect broken GetTor stats lines.
by karsten＠torproject.org 02 Nov '11

02 Nov '11

commit 5f9a9ca0879fc03db5336ba5416e347d470b79c3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 2 09:20:01 2011 +0100 Detect broken GetTor stats lines. --- src/org/torproject/ernie/cron/GetTorProcessor.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/cron/GetTorProcessor.java b/src/org/torproject/ernie/cron/GetTorProcessor.java index a6ddf11..65f2dd4 100644 --- a/src/org/torproject/ernie/cron/GetTorProcessor.java +++ b/src/org/torproject/ernie/cron/GetTorProcessor.java @@ -4,6 +4,7 @@ package org.torproject.ernie.cron; import java.io.*; import java.sql.*; +import java.text.*; import java.util.*; import java.util.logging.*; @@ -14,6 +15,7 @@ public class GetTorProcessor { /* Parse stats file. */ File getTorFile = new File(getTorDirectory, "gettor_stats.txt"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); if (!getTorFile.exists() || getTorFile.isDirectory()) { logger.warning("Could not read GetTor stats"); return; @@ -28,6 +30,13 @@ public class GetTorProcessor { while ((line = br.readLine()) != null) { String[] parts = line.split(" "); String date = parts[0]; + try { + dateFormat.parse(date); + } catch (ParseException e) { + logger.warning("Illegal line in GetTor stats file: '" + line + + "'. Skipping."); + continue; + } Map<String, Integer> obs = new HashMap<String, Integer>(); data.put(date, obs); for (int i = 2; i < parts.length; i++) {

1 0

[orbot/master] updating/cleaning project manifest files
by n8fr8＠torproject.org 01 Nov '11

01 Nov '11

commit 4dda90e4801bcf54da49f4f2badb825ba14f7b36 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Nov 1 20:35:51 2011 -0400 updating/cleaning project manifest files --- AndroidManifest.xml | 4 +- AndroidManifest.xml.debug | 61 ---------------------------------------- AndroidManifest.xml.production | 61 ---------------------------------------- 3 files changed, 2 insertions(+), 124 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ed256ff..365d3f9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.6-alpha-orbot-1.0.6-RC2" android:versionCode="18"> + package="org.torproject.android" android:versionName="0.2.3.7-alpha-orbot-1.0.6-RC3" android:versionCode="19"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <application android:theme="@style/DefaultTheme" android:icon="@drawable/icon" - android:label="@string/app_name" android:debuggable="true"> + android:label="@string/app_name" android:debuggable="false"> <activity android:name=".Orbot" android:theme="@android:style/Theme.NoTitleBar"> diff --git a/AndroidManifest.xml.debug b/AndroidManifest.xml.debug deleted file mode 100644 index 22b69dd..0000000 --- a/AndroidManifest.xml.debug +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug" - android:versionCode="13"> - - <uses-permission android:name="android.permission.INTERNET" /> - - - <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"> - - <activity android:name=".Orbot" - android:theme="@android:style/Theme.NoTitleBar"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - </activity> - - <activity android:name=".SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".AppManager" android:label="@string/app_name"/> - <activity android:name=".WizardActivity" android:label="@string/app_name"/> - -  - <service android:name=".service.TorService"> - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - -  - - </application> - - <uses-sdk android:minSdkVersion="4"/> - - - -</manifest> diff --git a/AndroidManifest.xml.production b/AndroidManifest.xml.production deleted file mode 100644 index 56fc228..0000000 --- a/AndroidManifest.xml.production +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a" android:versionCode="13"> - - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - - <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"> - - <activity android:name=".Orbot" - android:theme="@android:style/Theme.NoTitleBar"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - </intent-filter> - - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - </activity> - - <activity android:name=".SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".AppManager" android:label="@string/app_name"/> - <activity android:name=".WizardActivity" android:label="@string/app_name"/> - - <service android:enabled="true" - android:name=".service.TorService" - android:exported="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> - - - <receiver android:name=".OnBootReceiver"> - <intent-filter> - <action - android:name="android.intent.action.BOOT_COMPLETED" /> - <category android:name="android.intent.category.HOME" /> - </intent-filter> - </receiver> - - </application> - - <uses-sdk android:minSdkVersion="4"/> - - - -</manifest>

1 0

[orbot/master] updated tor binary to latest
by n8fr8＠torproject.org 01 Nov '11

01 Nov '11

commit d0bca772ae176aedf86c62d2ac7ab384e5a60bad Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Nov 1 20:35:40 2011 -0400 updated tor binary to latest --- res/raw/tor.zip | Bin 1553235 -> 1553272 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/tor.zip b/res/raw/tor.zip index 88eab0e..6ad8f33 100644 Binary files a/res/raw/tor.zip and b/res/raw/tor.zip differ

1 0

[metrics-tasks/master] Update the how-wrong-are-our-bridge-stats analysis (#3261).
by karsten＠torproject.org 01 Nov '11

01 Nov '11

commit ccd1a72cdb60f00c50163df9a59f7208ae407820 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 1 10:51:53 2011 +0100 Update the how-wrong-are-our-bridge-stats analysis (#3261). --- task-3261/.gitignore | 3 + task-3261/AnalyzeStatsCoverage.java | 70 ++++++++++++++++++++++++----------- task-3261/README | 2 +- task-3261/stats-coverage.R | 16 +++++-- 4 files changed, 63 insertions(+), 28 deletions(-) diff --git a/task-3261/.gitignore b/task-3261/.gitignore index 2f247e9..1e3dcc5 100644 --- a/task-3261/.gitignore +++ b/task-3261/.gitignore @@ -1,4 +1,7 @@ *.class *.png +*.pdf *.csv +in/ +temp/ diff --git a/task-3261/AnalyzeStatsCoverage.java b/task-3261/AnalyzeStatsCoverage.java index 9d6cc84..21d791e 100644 --- a/task-3261/AnalyzeStatsCoverage.java +++ b/task-3261/AnalyzeStatsCoverage.java @@ -18,6 +18,7 @@ public class AnalyzeStatsCoverage { if (inDirectory.exists() && inDirectory.isDirectory()) { System.out.println("Parsing descriptors in '" + inDirectory.getAbsolutePath() + "'."); + long started = System.currentTimeMillis(); tempDirectory.mkdirs(); Stack<File> dirs = new Stack<File>(); SortedSet<File> files = new TreeSet<File>(); @@ -36,9 +37,12 @@ public class AnalyzeStatsCoverage { for (File file : files) { if (++fileNumber % (totalFiles / 1000) == 0) { int numberLength = String.valueOf(totalFiles).length(); + long minutesLeft = (((System.currentTimeMillis() - started) + * (totalFiles - fileNumber)) / fileNumber) / (60L * 1000L); System.out.printf("Parsed %" + numberLength + "d of %" - + numberLength + "d descriptors (%3d %%)%n", fileNumber, - totalFiles, (fileNumber * 100) / totalFiles); + + numberLength + "d descriptors (%3d %%) %d minutes left%n", + fileNumber, totalFiles, (fileNumber * 100) / totalFiles, + minutesLeft); } BufferedReader br = new BufferedReader(new FileReader(file)); String line, fingerprint = null, publishedLine = null; @@ -177,15 +181,20 @@ public class AnalyzeStatsCoverage { /* Parse relevant lines by fingerprint and date. The result will be * how many bytes that relay or bridge read/wrote in total, and how - * many bytes were included in the different reported statistics. */ + * many bytes were included in the different reported statistics. + * Another result is the number of seconds for which this relay or + * bridge reported byte histories and other statistics. */ if (tempDirectory.exists() && tempDirectory.isDirectory()) { System.out.println("Evaluating previously parsed descriptors in '" + tempDirectory.getAbsolutePath() + "'."); BufferedWriter bw = new BufferedWriter(new FileWriter(outFile)); - bw.write("fingerprint,date,totalwritten,totalread,dirreqwritten," - + "dirreqread,entrywritten,entryread,exitwritten,exitread," - + "cellwritten,cellread,connbidirectwritten,connbidirectread," - + "bridgewritten,bridgeread,geoipwritten,geoipread\n"); + bw.write("fingerprint,date,totalwritten,totalread,totalseconds," + + "dirreqwritten,dirreqread,dirreqseconds,entrywritten," + + "entryread,entryseconds,exitwritten,exitread,exitseconds," + + "cellwritten,cellread,cellseconds,connbidirectwritten," + + "connbidirectread,connbidirectseconds,bridgewritten," + + "bridgeread,bridgeseconds,geoipwritten,geoipread," + + "geoipseconds\n"); Stack<File> dirs = new Stack<File>(); SortedSet<File> files = new TreeSet<File>(); dirs.add(tempDirectory); @@ -204,15 +213,16 @@ public class AnalyzeStatsCoverage { if (++fileNumber % (totalFiles / 1000) == 0) { int numberLength = String.valueOf(totalFiles).length(); System.out.printf("Evaluated %" + numberLength + "d of %" - + numberLength + "d descriptors (%3d %%)%n", fileNumber, - totalFiles, (fileNumber * 100) / totalFiles); + + numberLength + "d descriptors/days (%3d %%)%n", + fileNumber, totalFiles, (fileNumber * 100) / totalFiles); } String fingerprint = file.getName().substring(0, 40); String date = file.getName().substring(41); long dateStartMillis = dateFormat.parse(date).getTime(); long dateEndMillis = dateStartMillis + 24L * 60L * 60L * 1000L; long[] writeHistory = new long[96], readHistory = new long[96]; - boolean[] dirreqStats = new boolean[96], + boolean[] running = new boolean[96], + dirreqStats = new boolean[96], entryStats = new boolean[96], exitStats = new boolean[96], cellStats = new boolean[96], @@ -245,6 +255,7 @@ public class AnalyzeStatsCoverage { System.exit(1); } history[j] = Long.parseLong(historyValues[i]); + running[j] = true; } currentMillis += 15L * 60L * 1000L; } @@ -300,38 +311,53 @@ public class AnalyzeStatsCoverage { } br.close(); bw.write(fingerprint + "," + date + ","); - long totalWritten = 0L, totalRead = 0L, dirreqWritten = 0L, - dirreqRead = 0L, entryWritten = 0L, entryRead = 0L, - exitWritten = 0L, exitRead = 0L, cellWritten = 0L, - cellRead = 0L, connBiDirectWritten = 0L, - connBiDirectRead = 0L, bridgeWritten = 0L, bridgeRead = 0L, - geoipWritten = 0L, geoipRead = 0L; + long totalWritten = 0L, totalRead = 0L, totalSeconds = 0L, + dirreqWritten = 0L, dirreqRead = 0L, dirreqSeconds = 0L, + entryWritten = 0L, entryRead = 0L, entrySeconds = 0L, + exitWritten = 0L, exitRead = 0L, exitSeconds = 0L, + cellWritten = 0L, cellRead = 0L, cellSeconds = 0L, + connBiDirectWritten = 0L, connBiDirectRead = 0L, + connBiDirectSeconds = 0L, bridgeWritten = 0L, bridgeRead = 0L, + bridgeSeconds = 0L, geoipWritten = 0L, geoipRead = 0L, + geoipSeconds = 0L; for (int i = 0; i < 96; i++) { totalWritten += writeHistory[i]; totalRead += readHistory[i]; + totalSeconds += running[i] ? 900L : 0L; dirreqWritten += dirreqStats[i] ? writeHistory[i] : 0L; dirreqRead += dirreqStats[i] ? readHistory[i] : 0L; + dirreqSeconds += dirreqStats[i] && running[i] ? 900L : 0L; entryWritten += entryStats[i] ? writeHistory[i] : 0L; entryRead += entryStats[i] ? readHistory[i] : 0L; + entrySeconds += entryStats[i] && running[i] ? 900L : 0L; exitWritten += exitStats[i] ? writeHistory[i] : 0L; exitRead += exitStats[i] ? readHistory[i] : 0L; + exitSeconds += exitStats[i] && running[i] ? 900L : 0L; cellWritten += cellStats[i] ? writeHistory[i] : 0L; cellRead += cellStats[i] ? readHistory[i] : 0L; + cellSeconds += cellStats[i] && running[i] ? 900L : 0L; connBiDirectWritten += connBiDirectStats[i] ? writeHistory[i] : 0L; connBiDirectRead += connBiDirectStats[i] ? readHistory[i] : 0L; + connBiDirectSeconds += connBiDirectStats[i] && running[i] ? 900L + : 0L; bridgeWritten += bridgeStats[i] ? writeHistory[i] : 0L; bridgeRead += bridgeStats[i] ? readHistory[i] : 0L; + bridgeSeconds += bridgeStats[i] && running[i] ? 900L : 0L; geoipWritten += geoipStats[i] ? writeHistory[i] : 0L; geoipRead += geoipStats[i] ? readHistory[i] : 0L; + geoipSeconds += geoipStats[i] && running[i] ? 900L : 0L; } - bw.write(totalWritten + "," + totalRead + "," + dirreqWritten - + "," + dirreqRead + "," + entryWritten + "," + entryRead - + "," + exitWritten + "," + exitRead + "," + cellWritten - + "," + cellRead + "," + connBiDirectWritten + "," - + connBiDirectRead + "," + bridgeWritten + "," + bridgeRead - + "," + geoipWritten + "," + geoipRead + "\n"); + bw.write(totalWritten + "," + totalRead + "," + totalSeconds + "," + + dirreqWritten + "," + dirreqRead + "," + dirreqSeconds + "," + + entryWritten + "," + entryRead + "," + entrySeconds + "," + + exitWritten + "," + exitRead + "," + exitSeconds + "," + + cellWritten + "," + cellRead + "," + cellSeconds + "," + + connBiDirectWritten + "," + connBiDirectRead + "," + + connBiDirectSeconds + "," + bridgeWritten + "," + + bridgeRead + "," + bridgeSeconds + "," + geoipWritten + "," + + geoipRead + "," + geoipSeconds + "\n"); } bw.close(); } diff --git a/task-3261/README b/task-3261/README index 1796e15..1b95743 100644 --- a/task-3261/README +++ b/task-3261/README @@ -1,4 +1,4 @@ $ javac AnalyzeStatsCoverage.java -$ java -Xmx4g AnalyzeStatsCoverage.java +$ java -Xmx4g AnalyzeStatsCoverage $ R --slave -f stats-coverage.R diff --git a/task-3261/stats-coverage.R b/task-3261/stats-coverage.R index b9c1810..d0794b9 100644 --- a/task-3261/stats-coverage.R +++ b/task-3261/stats-coverage.R @@ -1,11 +1,17 @@ library(ggplot2) b <- read.csv("stats-coverage.csv") -b <- aggregate(list(totalwritten = b$totalwritten, - bridgewritten = b$bridgewritten, geoipwritten = b$geoipwritten), - by = list(date = b$date), sum) -b <- data.frame(date = b$date, value = b$bridgewritten / b$totalwritten) -ggplot(b, aes(x = as.Date(date), y = value)) + +b <- aggregate(list( + totalwritten = b$totalwritten, totalseconds = b$totalseconds, + bridgewritten = b$bridgewritten, bridgeseconds = b$bridgeseconds, + geoipwritten = b$geoipwritten, geoipseconds = b$geoipseconds), + by = list(date = as.Date(b$date)), sum) +b <- rbind(data.frame(date = b$date, variable = "by written bytes", + value = (b$bridgewritten + b$geoipwritten) / b$totalwritten), + data.frame(date = b$date, variable = "by uptime seconds", + value = (b$bridgeseconds + b$geoipseconds) / b$totalseconds)) +ggplot(b, aes(x = date, y = value)) + geom_line() + +facet_grid(variable ~ .) + scale_x_date(name = "", major = "3 months", minor = "1 month", format = "%b %Y", limits = as.Date(c("2010-10-01", "2011-09-30"))) + scale_y_continuous(name = "", limits = c(0, 1), formatter = "percent") +

1 0