diff --git a/scripts/Makefile b/scripts/Makefile index 0c117aa..1b697e9 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -352,6 +352,10 @@ thunder_configure_2_full_parse_bw: @. parse_lib.sh && \ parse_thunder_bw thunder_configure_2 27 +thunder_configure_2_full_parse_links: + @. parse_lib.sh && \ + parse_thunder_links thunder_configure_2 27 + tor_just_many_latencies: ./run-3 \ 16,tor_just_many_latencies . \ diff --git a/scripts/links_parse.py b/scripts/links_parse.py index f26c74c..93ac20c 100755 --- a/scripts/links_parse.py +++ b/scripts/links_parse.py @@ -2,7 +2,6 @@ import sys,re -print("run,ts,link_id,status") for line in sys.stdin: res = re.match(r"\[(\d+)\] Blacklisted links: ([_U]+)", line) if not res: continue diff --git a/scripts/parse_lib.sh b/scripts/parse_lib.sh index da5710e..531f54c 100644 --- a/scripts/parse_lib.sh +++ b/scripts/parse_lib.sh @@ -49,3 +49,12 @@ parse_thunder_bw() { done done } + +parse_thunder_links() { + echo "run,ts,link_id,status" + get_xp $1 | while read r; do + for i in $(seq 0 1 $2); do + grep -q 'thunder-server 8' out/$r-$i/info.txt && cat out/$r-$i/log/client-donar-stdout.log | ./links_parse.py $r-$i + done + done +}