From bda1b07b01d3e8c7a167e9d63ad302aef458a311 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 23 Sep 2019 15:37:24 +0000 Subject: [PATCH 1/2] Activate scheduler --- scripts/thunder-client | 2 +- scripts/thunder-server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/thunder-client b/scripts/thunder-client index 6705735..0f6075a 100755 --- a/scripts/thunder-client +++ b/scripts/thunder-client @@ -5,7 +5,7 @@ donar \ -c \ -o $6/shared/onion_services.pub \ -l $4 \ - -p jitter=$5 \ + -p jitter=$5,scheduler=1 \ -b \ -r 9000 \ > $6/log/client-donar-stdout.log 2> $6/log/client-donar-stderr.log & diff --git a/scripts/thunder-server b/scripts/thunder-server index e0a60e3..0d28438 100755 --- a/scripts/thunder-server +++ b/scripts/thunder-server @@ -6,7 +6,7 @@ donar \ -a thunder \ -s \ -l $1 \ - -p jitter=$2 \ + -p jitter=$2,scheduler=1 \ -b \ -e 9000 \ > ../log/server-donar-stdout.log 2> ../log/server-donar-stderr.log & From 9d8288e2980304966383c5a758bda9825a7187f0 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Mon, 23 Sep 2019 20:08:04 +0200 Subject: [PATCH 2/2] deltams --- scripts/deltams.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 scripts/deltams.py diff --git a/scripts/deltams.py b/scripts/deltams.py new file mode 100755 index 0000000..cac13fe --- /dev/null +++ b/scripts/deltams.py @@ -0,0 +1,31 @@ +#!/usr/bin/python3 +import sys,re + +owd = f"./out/{sys.argv[1]}/log/server-udpecho-stdout.log" +rtt = f"./out/{sys.argv[1]}/res/{sys.argv[2]}.csv" + +agg = {} +last_pkt = 0 + +with open(owd, 'r') as f: + for line in f: + res = re.match(r".*Packet (\d+) latency (\d+)µs", line) + if not res: continue + pkt_id,lat = res.groups() + pkt_id,lat = int(pkt_id), int(lat) + agg[pkt_id] = {"owd": lat } + +with open(rtt, 'r') as f: + for line in f: + res = re.match(r".*Packet (\d+) latency (\d+)µs", line) + if not res: continue + pkt_id,lat = res.groups() + pkt_id,lat = int(pkt_id), int(lat) + agg[pkt_id]["rtt"] = lat + last_pkt = pkt_id + +for i in range(last_pkt): + if i not in agg: continue + if "rtt" not in agg[i]: continue + + print(abs((agg[i]["rtt"] - 2*agg[i]["owd"]) / 1000), agg[i]["owd"] / 1000, (agg[i]["rtt"] - agg[i]["owd"]) / 1000, i)