commit d7d69baec734fdaad2c50a24cf11916854c44247 Author: David Fifield <david@bamsoftware.com> Date: Tue Feb 7 09:46:45 2012 -0800 Limit retries to 1000 to halt runaways. --- experiments/switching/local-http-alternating.sh | 4 ++-- experiments/switching/local-http-constant.sh | 4 ++-- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 4 ++-- experiments/switching/remote-tor-direct.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 696f1d5..08cca91 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -60,7 +60,7 @@ visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 1000 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 1000 -O /dev/null fi diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index c1a52f8..ff73c2a 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -54,7 +54,7 @@ PIDS_TO_KILL+=($!) visible_sleep 2 if [ -n "$OUTPUT_FILENAME" ]; then - real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null >> "$OUTPUT_FILENAME" + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 1000 -O /dev/null >> "$OUTPUT_FILENAME" else - real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 0 -O /dev/null + real_time wget http://127.0.0.1:2000/dump --wait=0 --waitretry=0 -t 1000 -O /dev/null fi diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 26070d9..2dcfbcc 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -57,7 +57,7 @@ PIDS_TO_KILL+=($!) visible_sleep 15 repeat_download() { - until torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME"; do + until torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 1000 -O "$DATA_FILE_NAME"; do echo "retrying" done } diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 939aef9..9d842c8 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -52,7 +52,7 @@ browser_goto "$PROFILE_1" "$PROXY_URL" visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 1000 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 1000 -O "$DATA_FILE_NAME" fi diff --git a/experiments/switching/remote-tor-direct.sh b/experiments/switching/remote-tor-direct.sh index 1b6bdaa..9b0740c 100755 --- a/experiments/switching/remote-tor-direct.sh +++ b/experiments/switching/remote-tor-direct.sh @@ -31,7 +31,7 @@ PIDS_TO_KILL+=($!) visible_sleep 15 if [ -n "$OUTPUT_FILENAME" ]; then - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 1000 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" else - real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 1000 -O "$DATA_FILE_NAME" fi