quentin/tor_multipath_voip
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve run-3 and makefile

Browse source
This commit is contained in:
Quentin 2019-09-06 17:03:51 +02:00
parent 6056736fb2
commit 698d4d0462
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Makefile
View file

@ -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, \

8
scripts/run-3
View file

@ -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"