From 6c57a0f822745267937ddb24ff5086361cc4d32f Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Tue, 21 May 2019 16:29:28 +0200
Subject: [PATCH] Add orig

---
 scripts/run-2 | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/run-2 b/scripts/run-2
index 9f5c932..3ed82fc 100755
--- a/scripts/run-2
+++ b/scripts/run-2
@@ -9,7 +9,7 @@ docker run \
   registry.gitlab.inria.fr/qdufour/donar \
   chown -R 1000:1000 /home/donar
 
-for i in {1..7}; do
+for i in {1..10}; do
 echo "Spawning container $i..."
 docker run \
   --rm \
@@ -29,7 +29,6 @@ docker run \
   registry.gitlab.inria.fr/qdufour/donar \
   tor -f /etc/torrc
 
-docker ps
 done
 
 sleep 10
@@ -39,7 +38,7 @@ echo "Run xp $j..."
 run_fold=`mktemp -up . XXXXXXXXXXXXXXXX`
 
 echo "Reset containers..."
-for i in {1..7}; do
+for i in {1..10}; do
   docker exec donarxp_client_${i} sh -c 'killall -9 bash; killall -9 donar; killall -9 measlat; killall -9 udpecho'
   docker exec donarxp_server_${i} sh -c 'killall -9 bash; killall -9 donar; killall -9 measlat; killall -9 udpecho'
 done
@@ -51,6 +50,9 @@ docker exec donarxp_server_4 rrhr-server ${run_fold}-rrhr-4 &
 docker exec donarxp_server_5 dup2-server ${run_fold}-dup2-5 &
 docker exec donarxp_server_6 rrhr-server ${run_fold}-rrhr-6 &
 docker exec donarxp_server_7 dup2-server ${run_fold}-dup2-7 &
+docker exec donarxp_server_8 orig-server ${run_fold}-orig-8 &
+docker exec donarxp_server_9 orig-server ${run_fold}-orig-9 &
+docker exec donarxp_server_10 orig-server ${run_fold}-orig-10 &
 
 sleep 10
 echo "Launch measures..."
@@ -68,12 +70,19 @@ timeout $WAITFOR bash <<EOF
   docker exec donarxp_client_6 rrhr-client 6000 100 100 ${run_fold}-rrhr-6 &
   sleep 10
   docker exec donarxp_client_7 dup2-client 6000 100 100 ${run_fold}-dup2-7 &
+  sleep 10
+  docker exec donarxp_client_8 rrhr-client 6000 100 100 ${run_fold}-orig-8 &
+  sleep 10
+  docker exec donarxp_client_9 rrhr-client 6000 100 100 ${run_fold}-orig-9 &
+  sleep 10
+  docker exec donarxp_client_10 rrhr-client 6000 100 100 ${run_fold}-orig-10 &
+  sleep 10
   wait;
 EOF
 done
 
 echo "Unspawn containers..."
-for i in {1..7}; do
+for i in {1..10}; do
   docker kill "donarxp_server_${i}"
   docker kill "donarxp_client_${i}"
 done