commit 7b4695fdb7b2cbafd9d5b4c664ad8a9cca70614e Author: David Fifield david@bamsoftware.com Date: Mon Oct 31 02:21:56 2011 -0700

Use --wait=0 --waitretry=0 in Wgets that retry.

By default, Wget waits between retrying failed downloads, and this was interfering with measurements. Here's an except from wget(1):

--waitretry=seconds If you don't want Wget to wait between every retrieval, but only between retries of failed downloads, you can use this option. Wget will use linear backoff, waiting 1 second after the first failure on a given file, then waiting 2 seconds after the second failure on that file, up to the maximum number of seconds you specify.

By default, Wget will assume a value of 10 seconds. --- experiments/switching/local-http-alternating.sh | 6 +++--- experiments/switching/local-http-constant.sh | 6 +++--- experiments/switching/remote-tor-alternating.sh | 4 ++-- experiments/switching/remote-tor-constant.sh | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 05276e7..7847a33 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -56,11 +56,11 @@ visible_sleep 1 echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2

if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index e5e50be..bcc65c8 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -51,10 +51,10 @@ browser_goto "$PROFILE_1" "$PROXY_URL" echo "Start socat." "$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -visible_sleep 1 +visible_sleep 2

if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 5309dce..97fb749 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -55,7 +55,7 @@ PIDS_TO_KILL+=($!) visible_sleep 15

if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c0d6338..e4dc48c 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -50,7 +50,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15

if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile -t 0 -O /dev/null + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -t 0 -O /dev/null fi