diff --git a/docs/DEMO.md b/docs/DEMO.md
index dc712d5..5904ea4 100644
--- a/docs/DEMO.md
+++ b/docs/DEMO.md
@@ -43,7 +43,8 @@ directories when available and falling back to the retained evaluation.
Play, pause and single-event stepping affect visual presentation. The backend
continues collecting the real run into an SSE journal. Slow Explain Mode samples
-key transitions at ten events per second and pauses briefly on major milestones.
+key transitions at one event per second and holds the first occurrence of each major milestone for four seconds.
+The event strip identifies the source and recorded time when available. A white outline identifies the current sequence inside the window.
The counters follow the displayed event, and measured backend timestamps remain
independent of presentation delays. Duplicate DATA arrivals are reported separately
from final file integrity.
diff --git a/scripts/commands/interactive.py b/scripts/commands/interactive.py
index 2d98b5f..0a58d42 100644
--- a/scripts/commands/interactive.py
+++ b/scripts/commands/interactive.py
@@ -10,6 +10,7 @@
import shutil
import subprocess
import sys
+import textwrap
import threading
import time
import zlib
@@ -35,10 +36,14 @@ def run(command, **kwargs):
def summary(lines, ok=True):
color = ('\033[32m' if ok else '\033[31m') if sys.stdout.isatty() else ''
reset = '\033[0m' if color else ''
- print(color + "\n+-- EXAMINER SUMMARY โ WHAT THIS PROVED --+")
- for line in lines:
- print("| " + str(line))
- print("+----------------------------------------+" + reset, flush=True)
+ width = min(shutil.get_terminal_size().columns, 76)
+ inner = max(1, width - 4)
+ border = '+' + '-' * (inner + 2) + '+'
+ print('\n' + color + border)
+ for line in ['RESULT' if ok else 'STAGE FAILED', *lines]:
+ for part in textwrap.wrap(str(line), inner):
+ print(f'| {part:<{inner}} |')
+ print(border + reset, flush=True)
def output_dir(name):
@@ -126,10 +131,11 @@ def localhost(directory, configurations, ports):
transfer_id=ids.pop(), source_sha256=digest, output_sha256=output_hash)
checksum = shutil.which('sha256sum')
if checksum:
- run([checksum, str(row['source']), str(row['target'])])
+ subprocess.run([checksum, row['source'].name, row['target'].name],
+ cwd=directory, check=True)
else:
- print("SHA-256 " + digest + " " + str(row['source']))
- print("SHA-256 " + output_hash + " " + str(row['target']))
+ print("SHA-256 " + digest + " " + row['source'].name)
+ print("SHA-256 " + output_hash + " " + row['target'].name)
result = [r['metrics'] for r in rows]
(directory/'summary.json').write_text(json.dumps(result, indent=2)+'\n')
return result
@@ -142,11 +148,11 @@ def localhost(directory, configurations, ports):
process.stdout.close()
-def comparison(rows):
+def comparison(rows, labels=("Baseline",)):
columns = ('seconds', 'goodput_mbps', 'data_sends', 'retransmits', 'out_of_order', 'duplicates', 'sha256_match')
- print("\nMetric " + " | ".join(f"Run {i+1:>2}" for i in range(len(rows))))
+ print("\n" + f"{'Metric':<17}" + ''.join(f'{label:>11}' for label in labels))
for key in columns:
- print(f"{key:<23} " + " | ".join(str(r.get(key, 'N/A')).rjust(12) for r in rows))
+ print(f"{key.replace('_', ' '):<17}" + ''.join(f"{str(row[key]):>11}" for row in rows))
def network_backend():
@@ -155,10 +161,28 @@ def network_backend():
native = (shutil.which('ovs-vsctl') and
subprocess.run([python, '-c', 'import mininet, os_ken'],
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode == 0)
+ if native:
+ manager = Path(python).with_name('osken-manager')
+ if manager.is_file():
+ # Exercise the manager bootstrap, including Eventlet monkey-patching.
+ check = subprocess.run([str(manager), '--version'], cwd=ROOT,
+ capture_output=True, text=True)
+ native = check.returncode == 0
+ if not native:
+ print("Native controller startup failed. Checking Docker.")
+ diagnostic = (check.stderr or check.stdout).strip().splitlines()
+ if diagnostic:
+ print(diagnostic[-1])
+ else:
+ native = False
if native:
prefix = [] if os.geteuid()==0 else ['sudo']
if subprocess.run([*prefix, 'ovs-vsctl', 'show'], stdout=subprocess.DEVNULL).returncode == 0:
return [*prefix, python, 'scripts/run.py'], False
+ return docker_backend()
+
+
+def docker_backend():
if shutil.which('docker'):
docker = ['docker']
if subprocess.run([*docker, 'info'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode:
@@ -196,7 +220,23 @@ def sdn(soft=False, backend=None):
if soft:
command += ['--scenario', 'soft-degradation', '--mib', '16']
env = dict(os.environ, RUDP_MULTIPATH='1')
- run(command, env=env)
+ try:
+ run(command, env=env)
+ except subprocess.CalledProcessError:
+ for log in directory.rglob('controller.log'):
+ print(f"Controller log: {log.relative_to(ROOT)}")
+ print('\n'.join(log.read_text(errors='replace').splitlines()[-8:]))
+ metrics = directory/'metrics.csv'
+ if not docker and metrics.is_file():
+ with metrics.open() as stream:
+ startup_failed = any('controller listening: process exited' in row.get('error', '')
+ for row in csv.DictReader(stream))
+ if startup_failed:
+ print("Native controller exited before listening. Trying Docker once.")
+ fallback = docker_backend()
+ if fallback:
+ return sdn(soft=soft, backend=fallback)
+ raise
with (directory/'metrics.csv').open() as stream:
rows = list(csv.DictReader(stream))
if not rows or any(r['success']!='True' or r['sha256_match']!='True' or r['expectation_met']!='True' for r in rows):
@@ -273,7 +313,7 @@ def stage(number):
child.mkdir()
(child/'sample.bin').write_bytes(sample)
rows += localhost(child, [flags+['--drop-rate','0.10']], [9000])
- comparison(rows)
+ comparison(rows, ("Basic", "Adaptive"))
summary(["A/B uses independently sampled 10% DATA loss",
"Reported metrics are from the two executions above",
"Both CRC32 & SHA-256 MATCH"])
@@ -281,7 +321,7 @@ def stage(number):
rows = localhost(output_dir('stage3'), [['--drop-rate','0.05','--sack','--adaptive-rto','--cc']]*2, [9000,9001])
if rows[0]['transfer_id']==rows[1]['transfer_id'] or rows[0]['source_sha256']==rows[1]['source_sha256']:
raise RuntimeError('Distinct session/source validation failed')
- comparison(rows)
+ comparison(rows, ("Port 9000", "Port 9001"))
summary([f"Flow 9000 | ID {rows[0]['transfer_id']} | {rows[0]['goodput_mbps']} Mb/s",
f"Flow 9001 | ID {rows[1]['transfer_id']} | {rows[1]['goodput_mbps']} Mb/s",
"Distinct payloads and sessions | Both SHA-256 MATCH"])
@@ -346,10 +386,16 @@ def main():
if args.step:
key = args.step
else:
- print("\n" + "="*80 + "\n RELIABLE UDP + OPENFLOW 1.3 SDN โ INTERACTIVE ASSESSMENT CONSOLE\n" + "="*80)
- for index, title in enumerate(STAGES, 1):
- print(f" [{index}] Stage {index}: {title}")
- print(" [a] Run Stages 1 -> 6 Sequentially\n [q] Quit\n" + "="*80)
+ width = min(80, shutil.get_terminal_size().columns)
+ left = ['LOCAL TRANSPORT', '[1] Baseline transfer', '[2] Loss and SACK', '[3] Concurrent flows']
+ right = ['NETWORK AND RESULTS', '[4] Hard link failover', '[5] Probes and multipath', '[6] Performance results']
+ print('\n' + '=' * width + '\nReliable UDP / OpenFlow demo\n')
+ if width >= 54:
+ for first, second in zip(left, right):
+ print(f'{first:<{width // 2}}{second}')
+ else:
+ print('\n'.join(left) + '\n\n' + '\n'.join(right))
+ print('\n[7] Test suite [8] Dashboard\n[a] Run 1โ6 [q] Quit\n' + '=' * width)
print("Select stage [1-8, a, q]: ", end='', flush=True)
try:
key = read_key()
@@ -363,6 +409,7 @@ def main():
continue
try:
for number in range(1,7) if key=='a' else [int(key)]:
+ print(f"\nStage {number} of 8\n" + textwrap.fill(STAGES[number-1], shutil.get_terminal_size().columns) + "\n")
stage(number)
except (RuntimeError, OSError, ValueError, subprocess.SubprocessError) as exc:
summary(["Stage failed", str(exc), "See actual endpoint/command output above"], ok=False)
diff --git a/scripts/visualizer/app.js b/scripts/visualizer/app.js
index 6baa2bd..28ab61e 100644
--- a/scripts/visualizer/app.js
+++ b/scripts/visualizer/app.js
@@ -92,7 +92,10 @@ async function request(path, body = {}) {
function error(exc) {
$("notice").textContent = exc.message;
}
+let focusSequence;
function reset(event) {
+ focusSequence = undefined;
+ $("event-focus").textContent = "Awaiting first event";
backendDone = false;
queue = [];
raw = [];
@@ -227,6 +230,7 @@ function renderRing() {
const slot = ring[i],
div = document.createElement("div");
div.className = "slot " + (slot?.state || "");
+ if (focusSequence === base + i) div.classList.add("current-slot");
const num = document.createElement("b");
num.textContent = slot?.sequence ?? base + i;
div.append(num);
@@ -450,6 +454,13 @@ function compare() {
function present(e) {
view = { ...blank(), ...(e.view || view) };
const seq = e.sequence;
+ focusSequence = seq ?? (e.event === "gap_detected" ? e.base : undefined);
+ const focus = [e.source, String(e.event || "record").replaceAll("_", " ")];
+ if (focusSequence != null) focus.push("sequence #" + focusSequence);
+ if (e.path) focus.push("path " + e.path);
+ if (e.monotonic_ns && origin !== null)
+ focus.push("trace time " + ((e.monotonic_ns - origin) / 1e9).toFixed(3) + " s");
+ $("event-focus").textContent = focus.filter(Boolean).join(" ยท ");
if (e.event === "variant_start") {
ring = [];
base = 0;
@@ -760,6 +771,7 @@ setInterval(() => {
const important = [
"dropped_gap",
"fast_retry",
+ "out_of_order",
"link_down",
"route_readyupper",
"route_readylower",
@@ -767,7 +779,7 @@ setInterval(() => {
].includes(milestone);
const hold = slow && important && !seenMilestones.has(milestone);
if (hold) seenMilestones.add(milestone);
- nextAt = performance.now() + (hold ? 1200 : slow ? 100 : 30);
+ nextAt = performance.now() + (hold ? 4000 : slow ? 1000 : 30);
}, 20);
setInterval(renderRaw, 500);
$("filter").oninput = renderRaw;
diff --git a/scripts/visualizer/index.html b/scripts/visualizer/index.html
index 2194f57..26ed8f8 100644
--- a/scripts/visualizer/index.html
+++ b/scripts/visualizer/index.html
@@ -79,12 +79,13 @@
>Waiting for a scenario
+
Awaiting first event
Choose scenario 1 to see a real file transfer, then compare loss recovery
or explore a recorded link cut.
- Explain mode samples key transitions at 10 events/s. Raw records remain
+ Explain mode samples key transitions at one event per second. Raw records remain
available below. Playback timing is separate from measured backend time.
diff --git a/scripts/visualizer/style.css b/scripts/visualizer/style.css
index 9a2fd9e..bde0b6f 100644
--- a/scripts/visualizer/style.css
+++ b/scripts/visualizer/style.css
@@ -366,3 +366,6 @@ thead {
margin: 0;
}
}
+
+#event-focus { padding: 0.6rem 1rem; color: #c9d1d9; font-weight: bold; }
+.slot.current-slot { outline: 2px solid #fff; outline-offset: -2px; }
diff --git a/tests/test_interactive.py b/tests/test_interactive.py
index d3d49f1..8004723 100644
--- a/tests/test_interactive.py
+++ b/tests/test_interactive.py
@@ -45,6 +45,22 @@ def trial(command, **kwargs):
menu.sdn(backend=([sys.executable,'scripts/run.py'],False))
self.assertIn('25.000', output.getvalue())
+ def test_native_startup_failure_retries_once_in_docker(self):
+ import tempfile
+ with tempfile.TemporaryDirectory(dir=ROOT/'results') as folder:
+ first, second = (Path(folder)/name for name in ('native', 'docker'))
+ first.mkdir()
+ second.mkdir()
+ (first/'metrics.csv').write_text('error\ncontroller listening: process exited\n')
+ (second/'metrics.csv').write_text(
+ 'success,sha256_match,expectation_met,link_down_to_progress_seconds\nTrue,True,True,0.025\n')
+ with patch.object(menu, 'output_dir', side_effect=[first, second]), \
+ patch.object(menu, 'run', side_effect=[subprocess.CalledProcessError(1, 'demo'), None]) as run, \
+ patch.object(menu, 'docker_backend', return_value=(['docker'], True)), \
+ patch.object(menu, 'open_plot'):
+ menu.sdn(backend=(['native'], False))
+ self.assertEqual([call.args[0][0] for call in run.call_args_list], ['native', 'docker'])
+
def test_real_baseline(self):
with contextlib.redirect_stdout(io.StringIO()) as output:
menu.stage(1)