mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* perf(timing): say which render-thread work a late frame followed The soak already says how often a moving frame reached the panel late, but not what the render thread was doing just before it. Vegas does two kinds of work there between frames -- building its strip (compose, extend) and, with live elements, patching changed pixels into it -- and deciding whether either is affordable needs their own numbers. - FrameTimingRecorder.note_op(kind, nbytes) tags the next presented frame. Totals gain op_frames, late_op_frames, op_freezes and op_bytes per kind; aggregate() still takes frames without ops. The file schema is unchanged. - Vegas tags compose and every strip extension (with the bytes it copied). - frame_soak prints an "after work" table: frames, late %, freezes and MB moved per kind, only when something tagged its work. - render_bench gains --strip-screens (Vegas-sized strips), --patch-bytes / --patch-every / --patch-where (in-place column writes, as a live element update does) and --extend-every-screens / --extend-width (append + trim on a fixed cadence that holds the strip's width). No runtime behaviour changes: this is the measurement gate for live Vegas elements. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): note the frame-op attribution and bench modes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * perf(scroll): build the strip's PIL image only when something reads it Every Vegas strip extension rebuilt ScrollHelper.cached_image from cached_array in full, twice (append, then trim), on the render thread: Image.fromarray is 1.7ms for an 8,000px strip and 3.8ms for 20,000px on a Pi 4 (measured on ledpi), about two thirds of an extension's render-thread cost. Nothing on the frame path reads the image's pixels; every frame is cut from the array. cached_image is now a property. append_content and drop_scrolled_prefix defer it; the first read builds it from the array it started with and keeps it only if the strip has not changed meanwhile, so a sync push racing an extension cannot leave a stale image cached. Assigning cached_image stores exactly what was assigned, as before. has_strip() says whether there is a strip without building its image; the helper's frame path, Vegas and the adapter's scroll-cache invalidation use it. The strip is also no longer held in memory twice. In Vegas the image is now built only by a multi-display sync push. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements -- a plugin API for content that changes while it scrolls Vegas bakes each plugin's pictures into one strip, so a card already on its way across the panel keeps what it showed when it was drawn. This adds the API and bookkeeping for content that can be updated in place; the worker that redraws and swaps it follows separately. No shipped plugin implements the hook yet, so nothing changes for users. Plugin API (core 3.8.0), all no-ops by default: - BasePlugin.get_vegas_elements() -> [VegasElement(key, image, version, live, refresh_hz)]: named, fixed-width pieces of Vegas content. - BasePlugin.redraw_vegas_element(key, width, height, at): a lock-free redraw for content that changes with time. - BasePlugin.notify_vegas_data_changed(): data that lands outside update(). - src/plugin_system/vegas_elements.py (VegasElement, re-exported from base_plugin). Core: - PluginAdapter asks a plugin that implements the hook for elements on the background fetch only (under its lock, on its own canvas); every other path keeps get_vegas_content(). Live elements are pinned (padded with content_padding, never trimmed), tagged with their key, digest and data epoch in Image.info so the existing cache and group plumbing carry them unchanged, and untagged if a width budget crops them. - RenderPipeline records where each live element lands (ElementRecord), in absolute strip columns a trim does not move; the block-start arithmetic is shared with the STATIC markers. - PluginManager update listeners (add/remove_update_listener, notify_data_changed): told the moment update() completes, not at the next ~4s Vegas poll. The coordinator uses one to move each plugin's data epoch on. - vegas_scroll.live_refresh (kill switch), live_max_hz, live_min_interval, live_lead_screens; per-plugin core-owned vegas_live. Live elements are off under multi-display sync, in swap mode and with offscreen_prefetch off. - scripts/check_plugin.py checks the element contract (src/plugin_system/testing/vegas.py); test/fixtures/plugins/vegas-live-stub is a working example. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat(vegas): live elements update in place while they scroll One background worker (src/vegas_mode/live_worker.py) redraws a plugin's live elements when its data epoch moves on (update listener) or on their refresh_hz, nearest the screen first, and hands changed pixels lock-free to the render thread, which copies them into the strip between frames (RenderPipeline.apply_live_patches, ScrollHelper.patch_columns): at most four patches or two screens of bytes a frame, no drawing or locks there. The worker takes over group prefetch once a live element is placed, runs inside the render gate, and is supervised. Update tick 1s while live elements exist. Web UI switch for live_refresh. OFFSCREEN_RENDERING.md describes what was built and why SegmentStrip was not needed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
180 lines
5.2 KiB
Python
180 lines
5.2 KiB
Python
"""When the live-element worker runs, and what happens to its work when it stops.
|
|
|
|
The worker fetches the strip's groups as well as redrawing live elements, so
|
|
starting it where nothing is live costs a thread for nothing, and stopping it
|
|
must not lose the group it was fetching: nothing else asks for one until the
|
|
next extension, which would then fetch inline and stall the scroll.
|
|
"""
|
|
import sys
|
|
import threading
|
|
import time
|
|
from pathlib import Path
|
|
|
|
import numpy as np
|
|
import pytest
|
|
from PIL import Image
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
|
|
from src.vegas_mode import elements, render_pipeline # noqa: E402
|
|
from src.vegas_mode.config import VegasModeConfig # noqa: E402
|
|
from src.vegas_mode.elements import ElementMeta # noqa: E402
|
|
from src.vegas_mode.render_pipeline import RenderPipeline # noqa: E402
|
|
|
|
from test.test_vegas_live_apply import _DM # noqa: E402
|
|
|
|
H = 32
|
|
|
|
|
|
def _image(width, seed, key=None):
|
|
rng = np.random.default_rng(seed)
|
|
pixels = rng.integers(20, 255, (H, width, 3), dtype=np.uint8)
|
|
image = Image.frombytes("RGB", (width, H), pixels.tobytes())
|
|
if key is None:
|
|
return image
|
|
pinned, array = elements.pin_element(image, 8)
|
|
return elements.tag(pinned, ElementMeta("p", key, 1, elements.pixel_digest(array), 0.0, 0.0))
|
|
|
|
|
|
class _Stream:
|
|
def __init__(self, live):
|
|
self.first = [("p", [_image(40, i, f"k{i}" if live else None) for i in range(6)])]
|
|
self.plugin_manager = type("PM", (), {"plugins": {}})()
|
|
self.plugin_adapter = None
|
|
self.taken = 0
|
|
|
|
def get_grouped_content_for_composition(self):
|
|
return self.first
|
|
|
|
def get_active_plugin_ids(self):
|
|
return ["p"]
|
|
|
|
def take_next_group(self, count=None, offscreen_only=False):
|
|
self.taken += 1
|
|
return [("q", [_image(40, 99)])]
|
|
|
|
|
|
class _FakeWorker:
|
|
"""Stands in for VegasWorker: no thread, and says what it was asked."""
|
|
|
|
instances = []
|
|
alive = True
|
|
|
|
def __init__(self, pipeline):
|
|
self.pipeline = pipeline
|
|
self.requests = 0
|
|
self.stopped = False
|
|
self.on_join = None
|
|
_FakeWorker.instances.append(self)
|
|
|
|
def start(self):
|
|
pass
|
|
|
|
def is_alive(self):
|
|
return _FakeWorker.alive and not self.stopped
|
|
|
|
def request_group(self):
|
|
self.requests += 1
|
|
|
|
def notify_data(self, plugin_id):
|
|
pass
|
|
|
|
def stop(self):
|
|
# Still finishing its job: alive until joined.
|
|
self.stopping = True
|
|
|
|
def join(self, timeout=None):
|
|
if self.on_join is not None:
|
|
self.on_join()
|
|
self.stopped = True
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def _fake_worker(monkeypatch):
|
|
_FakeWorker.instances = []
|
|
_FakeWorker.alive = True
|
|
monkeypatch.setattr(render_pipeline, "VegasWorker", _FakeWorker)
|
|
|
|
|
|
def _pipeline(live=True):
|
|
p = RenderPipeline(VegasModeConfig(continuous_scroll=True, lead_in_width=0),
|
|
_DM(), _Stream(live))
|
|
assert p.compose_scroll_content()
|
|
return p
|
|
|
|
|
|
def _wait_for(predicate, timeout=2.0):
|
|
deadline = time.monotonic() + timeout
|
|
while time.monotonic() < deadline:
|
|
if predicate():
|
|
return True
|
|
time.sleep(0.005)
|
|
return False
|
|
|
|
|
|
def test_supervision_starts_no_worker_while_nothing_is_live():
|
|
p = _pipeline(live=False)
|
|
p.set_live(True)
|
|
for _ in range(p.LIVE_SUPERVISE_FRAMES * 2 + 1):
|
|
p.apply_live_patches()
|
|
assert p._live_worker is None and not _FakeWorker.instances
|
|
|
|
|
|
def test_live_elements_start_the_worker_and_it_is_asked_for_a_group():
|
|
p = _pipeline()
|
|
p.set_live(True)
|
|
assert isinstance(p._live_worker, _FakeWorker)
|
|
assert p._live_worker.requests == 1
|
|
|
|
|
|
def test_switching_live_off_hands_group_fetching_back():
|
|
p = _pipeline()
|
|
p.set_live(True)
|
|
worker = p._live_worker
|
|
p.set_live(False)
|
|
assert p._live_worker is None and p._retired_worker is worker
|
|
assert _wait_for(lambda: p._prepared_group is not None)
|
|
assert worker.stopped # waited for before fetching
|
|
assert p._prefetch_thread.name == "vegas-strip-prefetch"
|
|
assert p.stream_manager.taken == 1
|
|
|
|
|
|
def test_a_group_the_stopping_worker_hands_over_is_kept():
|
|
p = _pipeline()
|
|
p.set_live(True)
|
|
worker = p._live_worker
|
|
handed = [("p", ["from the worker"])]
|
|
|
|
def publish():
|
|
with p._prefetch_lock:
|
|
p._prepared_group = handed
|
|
|
|
worker.on_join = publish
|
|
p.set_live(False)
|
|
p._prefetch_thread.join(2)
|
|
assert p._prepared_group is handed
|
|
assert p.stream_manager.taken == 0 # nothing fetched over it
|
|
|
|
|
|
def test_a_reset_while_stopping_fetches_nothing():
|
|
p = _pipeline()
|
|
p.set_live(True)
|
|
release = threading.Event()
|
|
p._live_worker.on_join = lambda: release.wait(2)
|
|
p.set_live(False)
|
|
p.reset()
|
|
release.set()
|
|
p._prefetch_thread.join(2)
|
|
assert p._prepared_group is None and p.stream_manager.taken == 0
|
|
|
|
|
|
def test_a_worker_given_up_on_hands_group_fetching_back():
|
|
p = _pipeline()
|
|
p.set_live(True)
|
|
_FakeWorker.alive = False # it, and every restart, dies
|
|
for _ in range(p.LIVE_WORKER_MAX_DEATHS):
|
|
p._ensure_live_worker()
|
|
assert not p._live_enabled and p._live_worker is None
|
|
assert _wait_for(lambda: p._prepared_group is not None)
|
|
assert p.stream_manager.taken == 1
|