From bc9ac1c559fc122f032cc9bc9f1e593c30e7f8e2 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Thu, 5 Sep 2019 10:40:28 +0200
Subject: [PATCH] Rework bw measure

---
 scripts/Makefile | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index cb7f240..bfe9d86 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,18 +1,42 @@
 tor_bw_small:
 	./run-3 \
 		1,tor_bw_small . \
-		orig-client 60 1000 100, orig-client 600 100 100, orig-client 6000 10 100, orig-client 60000 1 100 . \
-		orig-server, orig-server, orig-server, orig-server . \
-		tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple
+		orig-client 60 1000 100, \
+		  orig-client 120 500 100, \
+		  orig-client 600 100 100, \
+		  orig-client 1200 50 100 . \
+		orig-server, \
+		  orig-server, \
+		  orig-server, \
+		  orig-server . \
+		tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple . \
+		tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple
 
 tor_bw_full:
 	./run-3 \
 		10,tor_bw_full . \
-		orig-client 600 1000 100, orig-client 6000 100 100, orig-client 60000 10 100, orig-client 600000 1 100 . \
-		orig-server, orig-server, orig-server, orig-server . \
-		tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple . \
-		tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple, tor3 -f /etc/torrc_simple
+		orig-client 600 1000 100, \
+		  orig-client 1200 500 100, \
+		  orig-client 6000 100 100, \
+		  orig-client 12000 50 100 . \
+		orig-server, \
+		  orig-server, \
+		  orig-server, \
+		  orig-server . \
+		tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple . \
+		tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple, \
+		  tor3 -f /etc/torrc_simple
 
 tor_guards_small:
 	./run-3 \