diff --git a/scripts/Makefile b/scripts/Makefile index e05354f..ffdd5b5 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -162,7 +162,7 @@ tor_relays_full_parse: thunder_configure_small: ./run-3 \ - 16,thunder_configure. \ + 1,thunder_configure. \ thunder-client 600 100 100 $(link_num) 50, \ thunder-client 600 100 100 $(link_num) 100, \ thunder-client 600 100 100 $(link_num) 150, \ diff --git a/scripts/run-3 b/scripts/run-3 index 197ecc3..f625956 100755 --- a/scripts/run-3 +++ b/scripts/run-3 @@ -71,9 +71,6 @@ docker run \ -v `pwd`/out:/home/donar/out \ 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 @@ -85,6 +82,9 @@ 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 "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" + 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 @@ -93,6 +93,7 @@ echo " launch servers" for i in $(seq 0 $(expr $instances - 1)); do echo " instance=$i - exec=${SERVER_TARGETS[$i]}" docker exec donarxp_server_$i ${SERVER_TARGETS[$i]} ${run_fold}-$i & + sleep 5 done sleep 10 @@ -106,6 +107,7 @@ echo " launch clients" sleep 10 done; wait; echo " ok"; docker exec donarxp_client_${i} killall -15 donar; docker exec donarxp_server_${i} killall -15 donar; kill -15 $subshellpid)) 2>/dev/null +echo "done" done echo ":: Clear Resources"