Fix scripts

scripts/witness-client

@@ -1,5 +1,5 @@
 #!/bin/bash
-mkdir -p ./log
+mkdir -p ./{res,log}
 measlat -h 127.0.0.1 -p 9000 > /dev/null 2>&1 # Used to wait for connections
 measlat -h 127.0.0.1 -p 9000 -c $1 -i $2 -s $3 > ./res/witness.csv 2> ./log/client-measlat-stderr.log
 

scripts/witness-server

@@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p ./log
-udpecho -p 9000 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
+udpecho -p 9000 > ./log/server-udpecho-stdout.log 2> ./log/server-udpecho-stderr.log
 

scripts/xp-instance-runner

@@ -9,8 +9,6 @@ COUNT=$2
 INTERVAL=$3
 SIZE=$4
 ALLOWED_BOOTSTRAP=190
-ALLOWED_TIME=`expr $(expr ${COUNT} * ${INTERVAL}) / 1000 + ${ALLOWED_BOOTSTRAP}`
-echo "Will run for ${ALLOWED_TIME} (count=$1, interval=$2)"
 
 # Create folders
 docker run \
@@ -29,9 +27,10 @@ docker run \
   -v `pwd`/shared:/home/donar/shared \
   -v `pwd`/log:/home/donar/log \
   registry.gitlab.inria.fr/qdufour/donar \
-  ${XP_NAME}-server >/dev/null
+  ${XP_NAME}-server
 
 sleep 10
+docker ps
 
 # Run client
 docker run \
@@ -43,9 +42,7 @@ docker run \
   -v `pwd`/shared:/home/donar/shared \
   -v `pwd`/log:/home/donar/log \
   registry.gitlab.inria.fr/qdufour/donar \
-  ${XP_NAME}-client $COUNT $INTERVAL $SIZE >/dev/null
-
-#sleep $ALLOWED_TIME
+  ${XP_NAME}-client $COUNT $INTERVAL $SIZE
 
 # Kill
 #docker kill "$XP_ID-client" || true