wire the broker to the compositor, containers and pointer
The four slices existed and nothing called them. Now the broker builds a
spatial container per session, reads back what the compositor actually did,
and aims the cursor into one container under a broker-wide lease.
Record schema 3 (registry.py): `container` {output, workspace, mode,
created_by, state}, `pointer` {bookmark, last_released_at, released_by} and
the compositor's `signature`. A v2 record is migrated on load, not refused —
its application is still running. Every field that could not be verified is
null; `container: null` means "no container", never "probably something".
Containers (new container_host.py, manager.py, launcher.py): `start`
allocates a slot from `WorkspaceAllocator`, runs `container_plan()`'s argv,
launches the app with the container stamp in its environment, then reads the
workspace, output and window back out of `clients -j`. Teardown removes the
output, releases the slot and reports survivors rather than claiming success
— and runs for an unprompted exit and for `gc` too, so no container is ever
left unattended. Broker start-up reconciles: adopt `hh-*` outputs a live
session claims, remove the rest, `contains_output()` being the only filter.
No IPC means `container: degraded` and lifecycle verbs unchanged.
The plans' argv are dispatched over the compositor's request socket rather
than by executing `hyprctl`, which is what hyprctl does with the same words;
the reply is checked, so a refused command is not recorded as a container.
Pointer (new driver.py, manager.py): a client for the driver's private
socket, and `pointer.acquire|move|button|click|release|state` on top of
`PointerLease`. The broker owns the lease, the driver executes. The bookmark
is marked on every move and before release and stored in the record, so it
survives a restart. On expiry `pressed()` is read before `expire()` and
`release_all` goes to the driver, because the lease cannot lift a button
itself; a sweep runs unprompted so the TTL is a promise.
containers.py to v2: `quarantine_plan()` -> `quarantine_argv()`, with the
before-any-per-session-rule ordering stated where the caller could get it
wrong. protocol.py: 9 NO_LEASE, 10 COMPOSITOR, the verb table, and the
`request_id` cache moved out of the server so the CLI agrees with it.
Tests: real AF_UNIX everywhere — a stateful fake compositor and the shipped
pointer driver behind a recording sink. No mocked sockets, no compositor, no
VM. 551 -> 693.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017mUq7QvQ9EZb2Wi35xj4cs
This commit is contained in:
1 parent
20b2aee109
commit
129430bffd
20 files changed
+4805
-89
No files matched your search
@@ -118,6 +118,17 @@ ENV_DUMP = (
|
||||
"time.sleep(600)"
|
||||
)
|
||||
|
||||
# The container stamp as the application actually receives it. A separate app
|
||||
# from `envdump` because that one asserts on an exact three-key dict, and the
|
||||
# question here is a different one: did the class the window rule matches
|
||||
# reach the process.
|
||||
APP_ID_DUMP = (
|
||||
"import json, os, time; "
|
||||
"print(json.dumps({k: os.environ.get(k) for k in "
|
||||
"('HHSTREAM_APP_ID', 'SDL_VIDEO_WAYLAND_WMCLASS', 'RESOURCE_NAME')}), flush=True); "
|
||||
"time.sleep(600)"
|
||||
)
|
||||
|
||||
#: How the daemon may report having noticed an exit: a pidfd, or the documented
|
||||
#: /proc fallback where pidfd is unavailable.
|
||||
EXIT_MECHANISMS = {"pidfd", "proc_poll", "proc_check"}
|
||||
@@ -146,6 +157,7 @@ def config_text(wrapper: Path | None = None) -> str:
|
||||
+ app("echoer", "import time; print('hello', flush=True); time.sleep(600)")
|
||||
+ app("chatty", "import time\nfor i in range(3):\n print(f'line {i}', flush=True)\n time.sleep(0.2)")
|
||||
+ app("envdump", ENV_DUMP)
|
||||
+ app("idump", APP_ID_DUMP)
|
||||
)
|
||||
|
||||
|
||||
@@ -154,6 +166,10 @@ class Daemon:
|
||||
|
||||
def __init__(self, root: Path, *extra_args: str):
|
||||
self.extra_args = list(extra_args)
|
||||
#: Extra environment for the daemon process, laid over the inherited
|
||||
#: one. The container tests use it to pin the compositor instance
|
||||
#: signature the way a real deployment's unit does.
|
||||
self.env: dict[str, str] = {}
|
||||
self.root = root
|
||||
self.socket = socket_path(root)
|
||||
self.state_dir = root / "state"
|
||||
@@ -194,7 +210,7 @@ class Daemon:
|
||||
stdout=open(self.log, "ab"),
|
||||
stderr=subprocess.STDOUT,
|
||||
cwd=str(REPO_ROOT),
|
||||
env={**os.environ, "PYTHONPATH": IMPORT_PATH},
|
||||
env={**os.environ, "PYTHONPATH": IMPORT_PATH, **self.env},
|
||||
)
|
||||
wait_until(
|
||||
lambda: socket_is_live(self.socket) or self.process.poll() is not None,
|
||||
|
||||
Reference in new issue
Block a user