Two things land together: the plan and contract draft P6 needs before it starts, and the
working notes that until now existed on exactly one machine.
1. P6's plan and contract draft (neither started; not one line of code)
docs/Disaggregated/P6-SPAWN-PLAN.md the package plan
docs/Disaggregated/P6-CONTRACT-DRAFT.md the contract draft (moves to
MG_Remote/CONTRACT-P6.md when c6 lands)
The three findings that mattered, all written into the documents:
a. P6 is SMALLER than its roadmap cell suggests. The transport primitives are already in
the tree and already tested: SocketDoorbell including hangup detection and the two
lost-wakeup fences (Doorbell.cpp:211-360, four cases in FdPassingTest), SCM_RIGHTS fd
passing, ShmSegment::Adopt, and the SurfaceOp / WindowKind schema already defined in
protocol.fbs. inproc uses a real second shm mapping rather than an alias, and
SessionRings.h:22-28 says that was done so today is not the first time it runs. P6 is
assembly plus a control plane plus a process, not "write a socket transport".
b. The evidence for "P6 is only a transport swap" has EXPIRED. It was bought by P5c, whose
audit found 59 direct memory accesses in a tree that already looked clean. P5e changed
the tree again. So the first package, a6, is a read-only audit that writes no code, and
every contract row that depends on it is marked PENDING a6 rather than decided in
advance.
c. P6 does not get a game running on the phone. ANativeWindow* is meaningless in the child,
and protocol.fbs:186-196's own comment says Android transfers the window out of band -
that band is P12. P6 lands pbuffer / surfaceless / offscreen, which is what HeadlessGL,
the split-equivalent lane and trace replay need, and which is exactly what P6's own exit
gate measures. A real window reaching the server is a named refusal. This gets its own
section because "P6 is done" would otherwise read as "the game runs now".
The contract adds rule G: a role may not name a process-local handle. It extends P5c's
rule E (a role may not name the other role's memory) from memory to identity - EGLDisplay /
EGLSurface / EGLContext / ANativeWindow* / fd number / pid / mapped address either cross as
a token this contract defines or they do not cross, and a descriptor crosses only through
SCM_RIGHTS, where the kernel renumbers it.
What P5e left for P6 gets its own section. The latch semantics are already designed
(ARCHITECTURE.md:504) and are copied unchanged. What is new is that after run-ahead the
client no longer waits while the peer process can DIE: the client holds records that were
published and will never be applied, and Android's freezer suspends the child without
closing anything. So slow and dead must be distinguishable WITHOUT a timeout threshold.
That is P6's only new design; everything else is carriage. It shares a predicate with E1's
outstanding re-specification (ID-122), and the two should be designed together.
Two gates carried over from P5e's lessons: G2 requires integration-spawn's test-name set to
match integration-split's name for name, because a differing set means the lane is quietly
running less; and the arm-proof gate requires every entry to record the child pid and
transport=spawn in its OWN private log - ID-124 established that this kind of false green
really happens, and a spawn lane that actually ran monolith would pass every other gate.
S2's shape must be settled before it is written, and the document says why: E1 is the
cautionary case.
2. The working notes move into the repository (docs/Disaggregated/notes/, 415 .md files)
ROADMAP / CURRENT_STAGE_PROGRESS / MEASUREMENTS cite ruling numbers, audit line numbers and
the provenance of gate figures from ~/w7/notes/, a directory that exists on one machine and
is under no version control. A record cited hundreds of times that lives only locally is not
a record, so it moves in whole, with its directory structure intact.
Only .md moves. Scripts, run logs, census and gate result JSON, patches, APKs and nm dumps
stay where they are: they are evidence DATA rather than documents - large, regenerated per
run, and mostly carrying absolute paths and device serials that mean something only on the
machine that produced them. The mapping and this split are written in
docs/Disaggregated/notes/README.md.
Two exceptions are recorded there too: P6's BRIEF has been promoted to a first-class
document and keeps no copy under notes/, so the two cannot drift apart; and recovered/ holds
material salvaged from failed workflow runs, which may duplicate the like-named phase
directories and is kept because a few of those were the only complete version at the time.
CI's citation lint takes docs/Disaggregated/*.md only (non-recursive), and notes/ is
deliberately outside it: those notes' file:line citations were written against their own
code heads, and resolving them against today's HEAD would fail wholesale - which is not an
error, it is their correct state as a historical record. To check one, use the revision it
declares (--rev).
3. Inconsistencies fixed in passing
- README.md's status line still said P5e was in progress while the stage table already said
closed.
- CURRENT_STAGE_PROGRESS's next-step item 1 still listed the exit gate as pending, though
(a) and (b) were run in the previous commit; rewritten to closed plus the one item that
actually remains (E1).
- ROADMAP's P6 row still had the pre-phase plan in three of its cells; it now carries the
package order, the scope boundary and the two new gates.
Checked with check_doc_citations.py: 125 citations across docs/Disaggregated/*.md, 0 problems.
4.1 KiB
P5 c1g v1 — ID-67 make-current control correction
Commit: c9878d69f3e112bc4ac22487239c6f505e773c01.
Change
Only MobileGL/MG_Test/Wire/RemoteClientControls.inc changed. The former
RepeatedMakeCurrentAdoptsRepublishedCapsWithoutAPumpOrPresent control is split into:
AnIdenticalRepeatedMakeCurrentRepublishesNothing: after the initial make-current, an identical(dpy, draw, read, ctx)repeat leaves the caps-mirror generation unchanged. The test double and control-plane API expose no pending-snapshot count, so this case uses ID-67's permitted generation assertion; the server's bind-once path publishes nothing.ADifferentTupleMakeCurrentIsAdoptedWithoutAPumpOrPresent: after changing the double'sMaxComputeWorkGroupCount[0], a make-current with a different context handle (same valid display/surface) immediately advances the mirror generation and changes the publicGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, ...)answer from 113 to 227. There is no explicit pump and no Present in the test.
Case (b) is live, not skipped: this head republishes on a real different-tuple native bind, and the client adopts the snapshot during that make-current.
No production code remains changed, so G1 is unaffected by construction.
Red once
- Case (a): temporarily changed the production early return from
if (!ok || !outcome.boundNatively)toif (!ok), forcing an identical repeat to republish. The named test alone went red:[ FAILED ] RemoteClientControls.AnIdenticalRepeatedMakeCurrentRepublishesNothing, childexited 89. The one-line perturbation was reverted. - Case (b): temporarily suppressed the
PublishCapsSnapshot()block on a different tuple by making its condition false. The named test alone went red:[ FAILED ] RemoteClientControls.ADifferentTupleMakeCurrentIsAdoptedWithoutAPumpOrPresent, childexited 95. The one-line perturbation was reverted.
Acceptance
Required build-split flags were
MOBILEGL_PIPE_PUSH=ON, MOBILEGL_BUILD_DISAGGREGATED=ON, and
MOBILEGL_BUILD_DISAGGREGATED_INPROC=ON; configure and final build exited 0.
ctest -L unit --output-on-failure: 2057/2057 passed, 0 failed (10 documented
pre-existing skips listed by CTest; no package skip).
Final ctest -R RemoteClientControls --output-on-failure output:
Test project /home/swung/w7/p5-c1g/build-split
1/18 RemoteClientControls.TeardownRefusesClearOnALiveSession ......................... Passed
2/18 RemoteClientControls.TeardownRefusesDrawArraysOnALiveSession .................... Passed
3/18 RemoteClientControls.TeardownRefusesReadPixelsOnALiveSession .................... Passed
4/18 RemoteClientControls.TeardownRefusesBlitFramebufferOnALiveSession ............... Passed
5/18 RemoteClientControls.TeardownRefusesPresentOnALiveSession ....................... Passed
6/18 RemoteClientControls.ReadPixelsPutsTheTightExtentOnTheWire ...................... Passed
7/18 RemoteClientControls.ShortOkReadPixelsReplyRefusesByName ........................ Passed
8/18 RemoteClientControls.ErrorReadPixelsReplyRefusesByName .......................... Passed
9/18 RemoteClientControls.ResourceRespecifyErrorIsNotADecline ........................ Passed
10/18 RemoteClientControls.MapPersistentErrorIsNotADecline ............................ Passed
11/18 RemoteClientControls.AnIdenticalRepeatedMakeCurrentRepublishesNothing ........... Passed
12/18 RemoteClientControls.ADifferentTupleMakeCurrentIsAdoptedWithoutAPumpOrPresent ... Passed
13/18 RemoteClientControls.BounceReadPixelsShortReplyRefusesBeforeScatter ............. Passed
14/18 RemoteClientControls.DeleteTexturesAdvancesTheWireOrdinal ....................... Passed
15/18 RemoteClientControls.BoundPackBufferOffsetReadRefusesByName ..................... Passed
16/18 RemoteClientControls.ServerRoleRespecifyDoesNotEmitClientInitialBytes ........... Passed
17/18 RemoteClientControls.HeaderOnlyDynamicStateCrossesWithoutBlobMissing ............ Passed
18/18 RemoteClientControls.ServerRoleFlushDoesNotRunTheClientSubDataFollowup .......... Passed
100% tests passed, 0 tests failed out of 18
Final source diff is one test file, +33/-4; production diff is empty.