From a29b7ad4eeaba35ee4066e9205159e29225e4d5d Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Sun, 3 Nov 2019 16:03:54 +0000 Subject: [PATCH] fastprobe --- scripts/Makefile | 28 ++++++++++++++++++++-------- scripts/fastprobe.py | 27 +++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100755 scripts/fastprobe.py diff --git a/scripts/Makefile b/scripts/Makefile index 5e8028a..c92c28a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -289,6 +289,9 @@ battle: dup2-client 7500 40 172 2, \ dup2-client 7500 40 172 2, \ dup2-client 7500 40 172 2, \ + lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ + lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ + lightning-client 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ @@ -301,6 +304,9 @@ battle: dup2-server-single 7500 40 172 2, \ dup2-server 7500 40 172 2, \ dup2-server 7500 40 172 2, \ + lightning-server-single 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ + lightning-server 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ + lightning-server 7500 40 172 16 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ lightning-server-single 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ lightning-server 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ lightning-server 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \ @@ -309,28 +315,34 @@ battle: lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3. \ + tor3 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor3 -f /etc/torrc_guard_2. \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3, \ + tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_3. + tor3 -f /etc/torrc_guard_2, \ + tor2 -f /etc/torrc_single_hop_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor3 -f /etc/torrc_guard_2. lightning-fastcount: ./run-3 \ diff --git a/scripts/fastprobe.py b/scripts/fastprobe.py new file mode 100755 index 0000000..64a3ce0 --- /dev/null +++ b/scripts/fastprobe.py @@ -0,0 +1,27 @@ +#!/usr/bin/python3 +# Packet 7495 latency 153496µs with flag 0 sent on link 6 with vanilla 0 + +import sys,re + +groupmap = {"0": "fast", "1": "probe"} +redmap = {"1": "orig", "0": "pad"} +res = {} +seen = set() + +for line in sys.stdin: + if "~ measlat ~" in line: + seen = set() + continue + m = re.match(r".*Packet (\d+) latency (\d+)µs with flag (\d) sent on link (\d+) with vanilla (\d)", line) + if not m: continue + if m[1] in seen: continue + seen.add(m[1]) + group = groupmap[m[3]] + red = redmap[m[5]] + if (group, red) not in res: res[(group,red)] = 0 + res[(group,red)] += 1 + +print("group,redundancy,count") +for key,val in res.items(): + g,r = key + print(f"{g},{r},{val}")