Merge branch 'master' of gitlab.inria.fr:qdufour/donar

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)

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 &

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 &