- tor-commits - lists.torproject.org

[flashproxy/master] Remove the 01 experiment.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit 87ba752d7c6bd6778b556a177ca661ac551a8697 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 21:00:37 2011 -0700 Remove the 01 experiment. This was a repeat of the 00 (throughput experiment) with RTMFP. But RTMFP is broken for high-bandwidth local connections: It will push bytes faster than they can be sent, buffer them, and eventually crash after using up all memory. --- experiments/01 | 79 -------------------------------------------------------- 1 files changed, 0 insertions(+), 79 deletions(-) diff --git a/experiments/01 b/experiments/01 deleted file mode 100755 index 8718e0d..0000000 --- a/experiments/01 +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -# Get arguments -if [ $1 ]; then - NUM_CLIENTS=$1 -else - NUM_CLIENTS=1 -fi - -# Go to flashproxy repo root dir -cd .. - -# Create 1GB dump file -echo "creating dump file..." -rm dump -dd if=/dev/null of=dump bs=1G seek=1 - -# Start http server -echo "starting http server..." -thttpd -p 1080 - -# Start crossdomain policy server -echo "starting cross domain policy server..." -sudo ./crossdomaind.py & - -# Start the facilitator -echo "starting facilitator..." -./facilitator.py 4701 -r 127.0.0.1:1080 - -# Start socat adapters -echo "starting socat adapters..." -i=1 -until [ $i -gt $NUM_CLIENTS ]; do - let local_port=2000+i - let remote_port=9000+i - socat TCP-LISTEN:${remote_port},reuseaddr,fork TCP-LISTEN:${local_port},reuseaddr & - let i=i+1 -done - -# Start the flash proxy, server side -echo "starting flash proxy server side..." -firefox & -sleep 2 -firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)" - -# Start the flash proxy, client side -echo "starting flash proxy client side..." -i=1 -until [ $i -gt $NUM_CLIENTS ]; do - let local_port=9000+i - firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701)" - let i=i+1 - sleep 2 -done - -let query_fac_time=NUM_CLIENTS+2 -sleep ${query_fac_time} - -# wget the dump file -echo "getting the dump file..." -i=2 -until [ $i -gt $NUM_CLIENTS ]; do - let local_port=2000+i - xterm -e "/bin/bash -c 'wget -t1 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" & - let i=i+1 - sleep 2 -done - -# Use this one for delaying the termination of experiment below -wget -t1 http://localhost:2001/dump -O - > /dev/null - -echo "Press enter to continue." -read - -# Slaughter the processes -sudo killall thttpd -ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -ps -ef | sed -n '/facilitator.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -sudo killall socat

1 0

r25192: {website} bump bundles to 0.2.3.7-alpha (except for ppc, since the bui (website/trunk/include)
by Erinn Clark 31 Oct '11

31 Oct '11

Author: erinn Date: 2011-10-31 02:39:39 +0000 (Mon, 31 Oct 2011) New Revision: 25192 Modified: website/trunk/include/versions.wmi Log: bump bundles to 0.2.3.7-alpha (except for ppc, since the build machine is snowed in) Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-10-30 23:00:18 UTC (rev 25191) +++ website/trunk/include/versions.wmi 2011-10-31 02:39:39 UTC (rev 25192) @@ -2,27 +2,27 @@ <define-tag version-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable>-2</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.6-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.7-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag>

1 0

[flashproxy/master] Reduce the crossdomain timeout from 2.0 s to 0.5 s.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit c04baba6de5ca0301ef3f3d9ddb868ad878cbb97 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 18:26:47 2011 -0700 Reduce the crossdomain timeout from 2.0 s to 0.5 s. The public connector has logged 160 crossdomain connections since 2011-09-05. The log entries only have a resolution of a second. That said, in only nine of those entries did the time advance by a second before the crossdomain request was received. This gives an estimate of the mean time before receiving a crossdomain request of 0.05625 s. --- connector.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index 624b776..3b08272 100755 --- a/connector.py +++ b/connector.py @@ -181,8 +181,11 @@ def format_peername(s): return "<unconnected>" # How long to wait for a crossdomain policy request before deciding that this is -# a normal socket. -CROSSDOMAIN_TIMEOUT = 2.0 +# a normal socket. In 160 crossdomain connections to the public facilitator, the +# mean time before receiving a crossdomain request is only 0.05625 s. But that +# was measured from log entries with a one-second resolution, so give a healthy +# margin above that. +CROSSDOMAIN_TIMEOUT = 0.5 # Local socket, accepting SOCKS requests from localhost local_s = listen_socket(options.local_addr)

1 0

[flashproxy/master] Use a small custom HTTP downloader rather than Wget.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit 7740d4fdb9626c8b47e99e30e60839c7f9abb90d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 16:57:01 2011 -0700 Use a small custom HTTP downloader rather than Wget. I had been timing downloads with "time wget" but that counts the time taken to establish (and possibly retry) the connection. In my graphs there was a clear effect where the first 20 connections would take x seconds to download, but the 21st and later would take x + 5 or so. --- experiments/throughput/httpget.py | 35 ++++++++++++++++++++++++++++++++++ experiments/throughput/throughput.sh | 17 +-------------- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/experiments/throughput/httpget.py b/experiments/throughput/httpget.py new file mode 100755 index 0000000..a08412b --- /dev/null +++ b/experiments/throughput/httpget.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python + +# A simple HTTP downloader that discards what it downloads and prints the time +# taken to download. We use this rather than "time wget" because the latter +# includes time taken to establish (and possibly retry) the connection. + +import getopt +import sys +import time +import urllib2 + +BLOCK_SIZE = 65536 + +label = None + +opts, args = getopt.gnu_getopt(sys.argv[1:], "l:") +for o, a in opts: + if o == "-l": + label = a + +try: + stream = urllib2.urlopen(args[0], timeout=10) + start_time = time.time() + while stream.read(BLOCK_SIZE): + pass + end_time = time.time() + if label: + print "%s %.3f" % (label, end_time - start_time) + else: + print "%.3f" % (end_time - start_time) +except: + if label: + print "%s error" % label + else: + print "error" diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 5e2fd4b..7dcbad2 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -77,26 +77,13 @@ PIDS_TO_KILL+=($!) visible_sleep 1 -# Extract and parse the "real" part of "time" output and return as a count of -# seconds. -extract_real_time() { - perl -n -e '($m, $s) = ($_ =~ m/real\s+(\d+)m([\d\.]+)s/); if (defined($m)) { print $m*60 + $s . "\n"; }' -} - > "$RESULTS_FILE_NAME" declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do - echo "Start Wget $((i + 1))." - ( - times=$((time wget http://localhost:2000/dump -q --timeout 30 -t 1 -O /dev/null) 2>&1) - if [ $? -eq 0 ]; then - echo "$times" | extract_real_time >> "$RESULTS_FILE_NAME" - else - echo "error" >> "$RESULTS_FILE_NAME" - fi - ) & + echo "Start downloader $((i + 1))." + ./httpget.py http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done

1 0

[flashproxy/master] Do a long delay only when the browser isn't running yet.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit f53313602b7ebc57f00941aa1e064fff6ba3995a Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 17:02:06 2011 -0700 Do a long delay only when the browser isn't running yet. --- experiments/common.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index 485e908..6f2deea 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -18,7 +18,7 @@ visible_sleep() { ensure_browser_started() { local PROFILE="$1" - ("$FIREFOX" -P "$PROFILE" -remote "ping()" || "$FIREFOX" -P "$PROFILE" -no-remote & visible_sleep 5) 2>/dev/null + ("$FIREFOX" -P "$PROFILE" -remote "ping()" || ("$FIREFOX" -P "$PROFILE" -no-remote & visible_sleep 5)) 2>/dev/null } browser_clear() {

1 0

[flashproxy/master] Do a download direct not through the proxy as well, for comparison.
by dcf＠torproject.org 31 Oct '11

31 Oct '11

commit 0031f2b3c3fe3cb2035759942c10999d0ccb213d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 17:02:21 2011 -0700 Do a download direct not through the proxy as well, for comparison. --- experiments/throughput/throughput.sh | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 7dcbad2..304e5e5 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -79,14 +79,30 @@ visible_sleep 1 > "$RESULTS_FILE_NAME" +# Proxied downloads. declare -a WAIT_PIDS i=0 while [ $i -lt $NUM_CLIENTS ]; do echo "Start downloader $((i + 1))." - ./httpget.py http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & + ./httpget.py -l proxy http://localhost:2000/dump >> "$RESULTS_FILE_NAME" & WAIT_PIDS+=($!) i=$((i + 1)) done for pid in "${WAIT_PIDS[@]}"; do wait "$pid" done +unset WAIT_PIDS + +# Direct downloads. +declare -a WAIT_PIDS +i=0 +while [ $i -lt $NUM_CLIENTS ]; do + echo "Start downloader $((i + 1))." + ./httpget.py -l direct http://localhost:8000/dump >> "$RESULTS_FILE_NAME" & + WAIT_PIDS+=($!) + i=$((i + 1)) +done +for pid in "${WAIT_PIDS[@]}"; do + wait "$pid" +done +unset WAIT_PIDS

1 0

[tor/master] remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit a6ea34977b0c053cfc330a207961374f58911a7f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 31 00:52:52 2011 +0000 remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle --- changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/win-bundle-path b/changes/win-bundle-path new file mode 100644 index 0000000..32ff514 --- /dev/null +++ b/changes/win-bundle-path @@ -0,0 +1,4 @@ + o Packaging changes: + - Remove absolute path from makensis.exe command to build Tor expert bundle + in order to make it easier to automate package builds + diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 59811f4..b8a46cd 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -91,5 +91,5 @@ clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample cp contrib/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp -"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi.in +makensis.exe contrib/tor-mingw.nsi.in

1 0

[tor/master] Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit 16dbcafb06205bd193bc2656dfbdaf20865ab203 Merge: c5c5f85 a6ea349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 30 21:28:19 2011 -0400 Merge remote-tracking branch 'erinn/win-bundle-fix' into maint-0.2.2 changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit c58f4a86521d3d222d60787d63f6040f73a4c054 Merge: c2d03be 16dbcaf Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 30 21:28:36 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle
by nickm＠torproject.org 31 Oct '11

31 Oct '11

commit a6ea34977b0c053cfc330a207961374f58911a7f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 31 00:52:52 2011 +0000 remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle --- changes/win-bundle-path | 4 ++++ contrib/package_nsis-mingw.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/win-bundle-path b/changes/win-bundle-path new file mode 100644 index 0000000..32ff514 --- /dev/null +++ b/changes/win-bundle-path @@ -0,0 +1,4 @@ + o Packaging changes: + - Remove absolute path from makensis.exe command to build Tor expert bundle + in order to make it easier to automate package builds + diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 59811f4..b8a46cd 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -91,5 +91,5 @@ clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample cp contrib/tor-mingw.nsi.in win_tmp/contrib/ cd win_tmp -"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi.in +makensis.exe contrib/tor-mingw.nsi.in

1 0