From 6056736fb258dba2c2e41a93af520fee0ce20af6 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 6 Sep 2019 16:33:52 +0200 Subject: [PATCH] Log more data in info.txt --- scripts/Makefile | 2 +- scripts/run-3 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 5df5c6d..e05354f 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -170,7 +170,7 @@ thunder_configure_small: thunder-client 600 100 100 $(link_num) 250, \ thunder-client 600 100 100 $(link_num) 300, \ thunder-client 600 100 100 $(link_num) 350. \ - thunder-server $(link_num) 50, + thunder-server $(link_num) 50, \ thunder-server $(link_num) 100, \ thunder-server $(link_num) 150, \ thunder-server $(link_num) 200, \ diff --git a/scripts/run-3 b/scripts/run-3 index 6fe7ead..197ecc3 100755 --- a/scripts/run-3 +++ b/scripts/run-3 @@ -72,6 +72,8 @@ docker run \ registry.gitlab.inria.fr/qdufour/donar \ ${TOR_DAEMON_CLIENT[$i]} + docker exec donarxp_client_${i} sh -c "mkdir -p $run_fold-$i; echo repeat=$REPEAT,identifier=$IDENTIFIER > $run_fold-$i/info.txt" + docker exec donarxp_client_${i} sh -c "echo instance=$i - server=${SERVER_TARGETS[$i]} - client=${CLIENT_TARGETS[$i]} - tor server=${TOR_DAEMON_SERVER[$i]} - tor client=${TOR_DAEMON_CLIENT[$i]}>> $run_fold-$i/info.txt" done sleep 10 @@ -83,7 +85,6 @@ echo "start - batch_count=$j - folder=$run_fold" echo " reset containers" for i in $(seq 0 $(expr $instances - 1)); do - docker exec donarxp_client_${i} sh -c "mkdir -p $run_fold-$i; echo repeat=$REPEAT,identifier=$IDENTIFIER > $run_fold-$i/info.txt" docker exec donarxp_client_${i} sh -c 'killall --quiet -9 bash; killall --quiet -9 donar; killall --quiet -9 measlat; killall --quiet -9 udpecho; killall --quiet -9 torecho' docker exec donarxp_server_${i} sh -c 'killall --quiet -9 bash; killall --quiet -9 donar; killall --quiet -9 measlat; killall --quiet -9 udpecho; killall --quiet -9 torecho' done