summaryrefslogtreecommitdiff
path: root/test/delay_relay.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/delay_relay.py')
-rw-r--r--test/delay_relay.py28
1 files changed, 18 insertions, 10 deletions
diff --git a/test/delay_relay.py b/test/delay_relay.py
index 9d57095f..c600a3aa 100644
--- a/test/delay_relay.py
+++ b/test/delay_relay.py
@@ -4,9 +4,11 @@ it accepts on one socket, connects each client on to another, and holds
every chunk `delay` ms each way, timed from its arrival, so a stream's
throughput is not serialised behind the delay and its bytes stay in order.
An optional rate cap makes the link a bottleneck too: a chunk leaves once
-the ones before it have crossed at that rate, then waits out the delay.
+the ones before it have crossed at that rate, then waits out the delay. An
+optional jitter adds up to that many ms more to each chunk's delay, at
+random, its order kept (a chunk never overtakes the one before it).
- python3 -B test/delay_relay.py LISTEN TARGET --delay MS [--rate MB/s]
+ python3 -B test/delay_relay.py LISTEN TARGET --delay MS [--rate MB/s] [--jitter MS]
python3 -B test/delay_relay.py --self-check
An address is a path (a Unix socket) or host:port (TCP). The one-way
@@ -17,6 +19,7 @@ adds at each, and with a cap.
import argparse
import os
import queue
+import random
import socket
import statistics
import sys
@@ -58,13 +61,15 @@ def listen(address):
return s
-def pump(src, dst, delay, rate, done):
+def pump(src, dst, delay, rate, done, jitter=0.0):
"""src -> dst, each chunk due `delay` s after it arrived (and after the
- ones before it crossed at `rate` bytes/s), in order; its end a shutdown."""
+ ones before it crossed at `rate` bytes/s), plus up to `jitter` s at
+ random but never before the chunk ahead of it; its end a shutdown."""
due_q = queue.SimpleQueue()
def reader():
free = 0.0 # when the capped link has sent what it holds
+ last = 0.0 # when the chunk before is due: order is kept
while True:
try:
data = src.recv(CHUNK)
@@ -74,7 +79,8 @@ def pump(src, dst, delay, rate, done):
if rate:
free = max(free, now) + len(data) / rate
now = free
- due_q.put((now + delay, data))
+ last = max(last, now + delay + (random.uniform(0, jitter) if jitter else 0))
+ due_q.put((last, data))
if not data:
return
@@ -98,9 +104,10 @@ def pump(src, dst, delay, rate, done):
threading.Thread(target=writer, daemon=True).start()
-def serve(listener, target, delay_ms, rate_mbs=None):
+def serve(listener, target, delay_ms, rate_mbs=None, jitter_ms=0):
"""Relays every connection `listener` accepts until it is closed."""
delay = delay_ms / 1000
+ jitter = jitter_ms / 1000
rate = rate_mbs * 1e6 if rate_mbs else None
while True:
try:
@@ -124,8 +131,8 @@ def serve(listener, target, delay_ms, rate_mbs=None):
a.close()
b.close()
- pump(client, upstream, delay, rate, done)
- pump(upstream, client, delay, rate, done)
+ pump(client, upstream, delay, rate, done, jitter)
+ pump(upstream, client, delay, rate, done, jitter)
# ---- the self-check ----
@@ -252,12 +259,13 @@ def main():
ap.add_argument('target')
ap.add_argument('--delay', type=float, required=True, help='one-way delay, ms')
ap.add_argument('--rate', type=float, help='a bandwidth cap, MB/s')
+ ap.add_argument('--jitter', type=float, default=0, help='up to this many ms more a chunk, at random')
a = ap.parse_args()
listener = listen(a.listen)
print(f'relaying {a.listen} -> {a.target}, {a.delay} ms each way'
- + (f', {a.rate} MB/s' if a.rate else ''), flush=True)
+ + (f', {a.rate} MB/s' if a.rate else '') + (f', jitter {a.jitter} ms' if a.jitter else ''), flush=True)
try:
- serve(listener, a.target, a.delay, a.rate)
+ serve(listener, a.target, a.delay, a.rate, a.jitter)
except KeyboardInterrupt:
pass