diff --git a/r/thunder_configure.R b/r/thunder_configure.R new file mode 100644 index 0000000..9416c30 --- /dev/null +++ b/r/thunder_configure.R @@ -0,0 +1,6 @@ +library(ggplot2) +library(sqldf) +library(plyr) +library(cowplot) + +thunder_ms <- read.csv("thunder_configure_ms.csv") diff --git a/scripts/Makefile b/scripts/Makefile index 3063018..9ccff8a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -224,6 +224,10 @@ thunder_configure_full: tor2 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_2 +thunder_configure_full_parse: + @. parse_lib.sh && \ + parse_thunder thunder_configure 6 + tor_just_many_latencies: ./run-3 \ 16,tor_just_many_latencies . \ diff --git a/scripts/parse_lib.sh b/scripts/parse_lib.sh index 9002b1d..f6949f1 100644 --- a/scripts/parse_lib.sh +++ b/scripts/parse_lib.sh @@ -2,6 +2,10 @@ get_xp() { grep -rn "identifier=$1" ./out/*/info.txt|grep -Po "^./out/\w+"|grep -Po '\w+$$'|uniq } +is_measurement_done() { + grep -q 'Measurement done' ./out/$1-$2/res/*.csv +} + extract_us() { grep -Po '\d+µs' ./out/$1-$2/res/*.csv | grep -Po '\d+' } @@ -10,9 +14,22 @@ parse_latency() { echo "run,conf,latency" get_xp $1 | while read r; do for i in $(seq 0 1 $2); do - extract_us $r $i | while read l; do + is_measurement_done $r $i && extract_us $r $i | while read l; do echo $r,$i,$l; done done done } + +parse_thunder() { + echo "run,jmax,links,latency" + get_xp $1 | while read r; do + for i in $(seq 0 1 $2); do + links=$(grep -Po "thunder-server \d+" out/$r-$i/info.txt|grep -Po "\d+$") + jmax=$(grep -Po "thunder-server \d+ \d+" out/$r-$i/info.txt|grep -Po "\d+$") + is_measurement_done $r $i && extract_us $r $i | while read l; do + echo $r,$jmax,$links,$l; + done + done + done +}