diff --git a/r/thunder_configure.R b/r/thunder_configure.R index 9416c30..710402d 100644 --- a/r/thunder_configure.R +++ b/r/thunder_configure.R @@ -4,3 +4,19 @@ library(plyr) library(cowplot) thunder_ms <- read.csv("thunder_configure_ms.csv") + +thunder_ms <- sqldf("select run,jmax,links,latency, CAST(latency as real) / 1000. as lat_ms from thunder_ms") +thunder_ms$links <- as.factor(thunder_ms$links) +thunder_ms$jmax <- as.factor(thunder_ms$jmax) + +v1 <- ggplot(data = thunder_ms, aes(x = jmax, y=lat_ms, fill=links)) + + geom_boxplot( outlier.shape = NA) + + scale_fill_grey() + + ylim(0,1000) + + ylab("latency (ms)") + + xlab("max allowed jitter") + + theme_classic() + +v1 + ggsave("thunder_configure_ms.png", dpi=300, dev='png', height=5, width=15, units="cm") + +thunder_rcv <- sqldf("select run,jmax,links,(6000-COUNT(latency)*1.0)/6000 as dlv from thunder_ms group by jmax,links,run") diff --git a/scripts/run-3 b/scripts/run-3 index f625956..b35e70e 100755 --- a/scripts/run-3 +++ b/scripts/run-3 @@ -1,7 +1,7 @@ #!/bin/bash ## EXPERIMENT RUNNER -# ex: sudo ./scripts/run-3 2 . orig-client 100 100 100, orig-client 100 100 100 . orig-server, orig-server +# exemple: sudo ./scripts/run-3 2 . orig-client 100 100 100, orig-client 100 100 100 . orig-server, orig-server die() { echo "$*" 1>&2 ; exit 1; } @@ -105,7 +105,18 @@ echo " launch clients" echo " instance=$i - exec=${CLIENT_TARGETS[$i]}" docker exec donarxp_client_$i ${CLIENT_TARGETS[$i]} ${run_fold}-$i & 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 + done; + wait; + echo " ok"; + + for i in $(seq 0 $(expr $instances - 1)); do + docker exec donarxp_client_${i} killall -15 donar; + docker exec donarxp_server_${i} killall -15 donar; + done; + + kill -15 $subshellpid + +)) 2>/dev/null echo "done" done