Log power events, QEMU stderr and firmware serial; show them in a fixed pane

Three sources into one buffer: power events from the supervisor, QEMU's stderr
(which run.sh and the tests used to discard), and firmware serial, which the
machine model tags SERIAL. default_launcher now captures stderr rather than
sending it to DEVNULL, which is what made the last two reachable.

The pane is a fixed-height scroll box as asked: 180px with overflow-y:auto, so it
never grows with content -- older lines move up out of view and you scroll back to
read them.

Two details that make that usable rather than annoying:

- Autoscroll only sticks when you are already at the bottom. Otherwise a new line
  arriving would yank the view away from whatever you had scrolled up to read.
- MAX_LOG_LINES caps the <pre> as well. The box is fixed-height either way, but an
  unbounded DOM node would still grow memory across a long session.

Verified on the live server: power on produced power/qemu/serial lines including
"UV-K5 Firmware, EGZUMER-F4HWN+NR7Y c91cec95", each Reset logs the event and the
banner reappearing, and since= never resent a line. A capacity-500 buffer fed 2000
lines keeps exactly 500 and does not replay evicted entries to a stale cursor.
This commit is contained in:
mckero committed 2026-08-28 10:06:18 +01:00
1 parent 7db89231b6
commit c164917632
4 files changed
+187 -11

No files matched your search

+23 -5
View File
@@ -23,7 +23,7 @@ DEFAULT_QMP = "/tmp/uvk5-qmp.sock"
def default_launcher(qemu: str, flash: str, elf: str,
qmp_path: str = DEFAULT_QMP, gdb_port: int = 1234,
capture_stderr: bool = False):
capture_stderr: bool = True):
"""Reproduces the command line in tools/run.sh."""
def launch():
# A stale socket makes QEMU fail to bind, which looks like "power on did
@@ -50,13 +50,19 @@ def wait_for_socket(path: str, timeout: float = 15.0) -> bool:
class Supervisor:
def __init__(self, launch, connect):
def __init__(self, launch, connect, log=None):
self._launch = launch
self._connect = connect
self._log = log
self._lock = threading.Lock()
self._proc = None
self._client = None
def _note(self, text: str):
"""Record a power event, if anyone is collecting them."""
if self._log is not None:
self._log.add("power", text)
def is_running(self) -> bool:
with self._lock:
if self._client is None:
@@ -91,7 +97,15 @@ class Supervisor:
return False
self._proc = self._launch()
self._client = self._connect()
return True
proc = self._proc
self._note("power on")
# Forward QEMU's own stderr, which run.sh and the tests used to discard.
# Firmware serial arrives here too, tagged SERIAL by the machine model.
if self._log is not None and getattr(proc, "stderr", None) is not None:
threading.Thread(
target=self._log.pump_stream, args=(proc.stderr,),
kwargs={"default_source": "qemu"}, daemon=True).start()
return True
def power_off(self) -> bool:
with self._lock:
@@ -108,15 +122,18 @@ class Supervisor:
client.close()
except Exception:
pass
code = None
if proc is not None:
try:
proc.wait(timeout=10)
code = proc.wait(timeout=10)
except Exception:
proc.terminate()
try:
proc.wait(timeout=5)
code = proc.wait(timeout=5)
except Exception:
proc.kill()
self._note("power off" if code in (None, 0)
else f"power off (qemu exited with {code})")
return True
def reset(self) -> bool:
@@ -125,6 +142,7 @@ class Supervisor:
if client is None:
return self.power_on()
client.command("system_reset")
self._note("reset")
return True
def pause(self) -> bool: