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.
13 KiB
P1 package A (p1-core) — rework round 2 (v2)
Tree ~/w7/p1-core, branch p1/core, base feat/disaggregated @ 087685d1, contract bf86b1ed (tag p1/contract). v1 HEAD was 440d3c52 (reviewed in core-review-v1.md: 1 major, 8 minors). Four new commits on top; nothing pushed; working tree clean apart from the three untracked build directories. core-v1.md remains the record of c2..c6; this file records the rework and the full re-verification on the new HEAD.
Commits (oldest first, on top of 440d3c52)
| sha | subject | review item |
|---|---|---|
510ecd92 |
[Fix] (Impl): move the DeleteSync fill of the orphan sweep inside its null-entry guard |
minor 1 |
77ecde15 |
[Fix] (Pipe): refuse an eighth sticky row at compile time - the forwarded count equals the generated sticky count |
minor 8 |
878db2c4 |
[Fix] (Pipe): re-parse the POISON_OMIT and VERIFY knobs when their Features value changes, not once per process |
minor 4 (enabler) |
d9f4698d |
[Test] (Pipe): give every PipeInputsTest process its own log file, and cover the compare-at-read arm, the three knob parsers and VERIFY_FATAL=0 with forked children |
M1, minors 2, 3, 4 |
git diff --stat 440d3c52..HEAD: 4 files, +283/-37 — MobileGL/MG_Backend/MGPipe/PipeInputs.h (+4), MobileGL/MG_Impl/GLImpl/Sync/GL_Sync.cpp (+1/-1), MobileGL/MG_Impl/Pipe/PipeFill.cpp (+15/-2), MobileGL/MG_Test/Pipe/PipeInputsTest.cpp (rewritten). All inside A's C.5 rows; no B/C/E file, no fixture, no generated file (gen_pipe --check clean), no signature that B/C/E code against changed (MGB_CTX, MGP_FILL, the 63 accessors, the knob names and every log line are as in the contract).
What was done per review item
- M1 (shared log path) —
PipeInputsTest::main()names the filemobilegl-pipeinputs-test-<pid>.log(ProcessId()=getpid/_getpid) and removes it afterRUN_ALL_TESTS; a forked child inherits the path on purpose (it is the same file the parent reads the delta from). Proof:ctest --test-dir build-verify -R PipeInputsTest -j 8× 40 → 0/40 red (was 40/40 red at v1 per the review); build-push × 10 → 0/10 red;/tmp/mobilegl-pipeinputs-test*leftover count after the whole suite: see the verification table. - Minor 1 (
GL_Sync.cppDeleteSync sweep) — the fill moved insideif (backendDeleteSync && syncObject->backendHandle), the shape ofGL_Query.cpp'sDeleteBackendQuerysweep; D7 now holds there (a null entry never bumps). Fill count still 83 (Sync 6). Pull build unaffected (MGP_FILLis((void)0)): G1 re-proven below. - Minor 2 (compare-at-read arm had no falsifier) —
PipeInputsTest.MutatedFieldIsNamedAtRead(verify build, fork): child setsFeatures.PipeVerify = true, fillsDrawArrays, readsGetLineWidth()(completes, boundary == live) andGetRenderStateParameters(), thenpGLContext->SetLineWidth(boundary + 1)and readsGetLineWidth()again; parent assertsSIGABRT, the arming lineverify armed - 63 fields, 69 verbs, fatal=1,verify read of GetLineWidth (index 0, 0) differs from the live context, exactlyFatal{PipeVerifyDiffer, "GetLineWidth@DrawArrays", verb=<parent serial+1>, where=read}and nowhere=entry. Passes in build-verify; visible skip elsewhere. - Minor 3 (name overclaimed) —
OmittingOneFieldForOneVerbLeavesExactlyThatFieldStalenow loops all 63 fields after the omittedGenerateMipmapfill: fresh iff the bit is inkMGPipeVerbClass[GenerateMipmap]'s mask and the field is notGetActiveTextureUnit. - Minor 4 (knob parsers unreachable from a unit test) — the two latches in
PipeFill.cppnow key on the VALUE rather than "parsed once":ParsePoisonOmissionKnobre-parses whenFeatures.PipePoisonOmitdiffers from the last parsed string;ArmVerifyre-arms whenFeatures.PipeVerifydiffers fromg_verify.Enabled(and resetsCorrupton re-arm). A lane loadsFeaturesbefore its first fill, so lane behaviour is one parse/arm per process as before; a forked test child that setsFeaturesafter its parent filled gets its own parse. Cost: oneString ==(two empty strings in every shipped configuration) and oneBool ==per fill, push/verify builds only. Five new fork cases cover: the OMIT knob arming throughFeatures(arming line + the exactFatal{UnmigratedPipeInput, "GetActiveTextureUnit@GenerateMipmap"}), a bad verb in OMIT (Fatal{PipeVerifyBadKnob, "MOBILEGL_PIPE_POISON_OMIT=NoSuchVerb:GetActiveTextureUnit": no such verb in kMGPipeVerbNames}; this one runs in build-push too — the parser is switch-free), the CORRUPT knob throughFeatures(verify corruption armed - GetRenderStateParameters+Fatal{PipeVerifyDiffer, "GetRenderStateParameters@DrawArrays", verb=N, where=entry}), a bad CORRUPT field (Fatal{PipeVerifyBadKnob, "MOBILEGL_PIPE_VERIFY_CORRUPT=NoSuchField": no such field in kMGPipeInputFieldNames}and no arming line), andPipeVerifyFatal = false(child exits 0 after two fills, log has bothPipeVerifyDifferlines at consecutive serials,fatal=0in the arming line). TheMGLOG_W_ONCEfor OMIT in a POISON-less push build and forMOBILEGL_PIPE_VERIFY=1in a comparator-less build stay lane-verified only (the review's table) — they are one-shot log lines and the review already exercised them. - Minor 5 (
IsCapabilityEnabledIndexedasymmetry) — record only (below, for the integrator'sMEASUREMENTS.md); no code change: the push arm's Fatal for a cap other than Blend/ScissorTest is D6's rule for a field the block does not carry, and no backend asks another cap. - Minor 6 (GIT@ stamp) — record: all three libraries still carry
GIT@83b1656(the stamp is a configure-time value; no reconfigure happened in this round, only incremental builds, which relinkedbuild-linux/libMobileGL.sobecauseGL_Sync.cppchanged). The G1 comparison below is of the relinked library. - Minor 7 (3 vs 7 generated files) — record only;
gen_pipe --checkclean. - Minor 8 (hand-written 7) —
static_assert(kMGPipeForwardedFieldCount == kMGPipeInputStickyFieldCount)inPipeInputs.h(the generated constant is visible throughMGPipe.h→generated/PipeFilled.inc). - Integrator note in the review (vacuous
-R '...Mipmap'CI regex) — not A's file; recorded under "for the integrator" below.
Verification (WSL, ~/w7/p1-core, HEAD d9f4698d; logs ~/w7/p1-core-v2-*.log, summary ~/w7/p1-core-v2-summary.txt)
Builds: cmake --build {build-linux,build-push,build-verify} -j 12 all rc=0 (~/w7/p1-core-v2-build.log), CCACHE_BASEDIR=/home/swung/w7.
| command | actual output |
|---|---|
python3 scripts/gen_pipe.py --check |
rc=0, gen_pipe: generated files are up to date |
python3 scripts/gen_pipe.py --self-test |
rc=0, 6 controls tripped as expected, positive control OK |
python3 scripts/symbol_report.py --before ~/w7/p1-before-libMobileGL.so --after build-linux/libMobileGL.so --threshold 0 |
rc=0; .text 10792579 -> 10792579 (+0, +0.000%); Total 17209819 -> 17209819 (+0); 27799 -> 27799 defined symbols: 0 added, 0 removed, 0 resized, 0 renamed, 27060 unchanged (~/w7/p1-core-v2-symbol.md) |
cmp -l before after | wc -l / readelf -SW diff |
34 bytes (build-id + the two build stamps, as at v1); section table identical |
strings ... | grep GIT@ |
GIT@83b1656 in all three libraries (configure-time stamp; see minor 6) |
grep -rc pGLContext MobileGL/MG_Backend | sort | diff - ~/w7/p1-before-pglcontext.txt |
only MG_Backend/MGPipe/PipeInputs.{cpp,h}:0 appear; every catalogued count unchanged |
grep -c pGLContext MobileGL/MG_Backend/MGPipe/PipeInputs.{h,cpp} |
0 0 |
grep -c "MGP_FILL(" MobileGL/MG_Impl/GLImpl/*/*.cpp |
83: Drawing 36, Framebuffer 11, Getter 3, Program 1, Query 18, Sync 6, Texture 8 |
ctest --test-dir build-linux -L unit --no-tests=error -j 12 |
rc=0, 100% tests passed, 0 tests failed out of 1481 |
ctest --test-dir build-push -L unit --no-tests=error -j 12 |
rc=0, 100% tests passed, 0 tests failed out of 1481 |
ctest --test-dir build-verify -L unit --no-tests=error -j 12 |
rc=0, 100% tests passed, 0 tests failed out of 1481 |
ctest -N names vs ~/w7/p1-before-ctest-names.txt (regex '^\s+Test\s+#[0-9]+:') |
2349 names in each of the three dirs; comm -23 before now = 0 removed; 15 added = the 4 PipeCatalogue.* of v1 + 11 PipeInputsTest.* (the v1 five + MutatedFieldIsNamedAtRead, PoisonOmitKnobArmsTheOmission, BadPoisonOmitKnobIsFatalNamingTheKnob, VerifyCorruptKnobNamesTheFieldAtEntry, BadVerifyCorruptKnobIsFatalNamingTheKnob, VerifyFatalOffLogsTheDivergenceAndContinues); push and verify name sets identical |
ctest -R PipeInputsTest -V, skip visibility |
build-linux 11 ***Skipped ("push not compiled in"); build-push 9 skipped (5 "verify not compiled in", 4 "poison not compiled in"), ReadingAFilledFieldCompletes and BadPoisonOmitKnobIsFatalNamingTheKnob pass; build-verify 0 skipped, 11/11 pass |
M1 repro, fixed: ctest --test-dir build-verify -R PipeInputsTest -j 8 × 40 |
red=0/40 (~/w7/p1-core-v2-stress-{1..40}.log); v1 was 40/40 red per the review |
ctest --test-dir build-push -R PipeInputsTest -j 8 × 10 |
red=0/10 |
nm -D --defined-only <lib> | grep -c MGPipeVerifyInputs |
push 0, verify 1 |
ctest --test-dir build-push -L integration-gpu --no-tests=error -j 4 |
PENDING-ITEST |
leftover /tmp/mobilegl-pipeinputs-test* after the whole suite |
PENDING-LEFTOVER |
G4 unit (CorruptedSnapshotFieldIsNamedWithItsSerial, VerifyCorruptKnobNamesTheFieldAtEntry, MutatedFieldIsNamedAtRead) |
pass in build-verify: entry compare names the corrupted field at its serial (block level and through the knob), and the compare-at-read arm names a mutated field where=read — both arms now have a falsifier |
G5 unit (OmittingOneField..., ReadingAnOmittedFieldAbortsNamingTheVerb, PoisonOmitKnobArmsTheOmission, ReadingAFilledFieldCompletes) |
pass in build-verify (the two poison-free ones also in build-push): the exact Fatal{UnmigratedPipeInput, "GetActiveTextureUnit@GenerateMipmap"}, no @DrawArrays, no GetTextureUnitObject@; the sibling exits 0 with no Fatal{ |
| commit hygiene | 4 commits, [Type] (Scope): ... + blank + - bullets, no Co-Authored-By/attribution, nothing pushed; git status clean; all LF |
Not run (unchanged from v1): the 40-trace retrace under verify and the integration-verify lane (E's files, D.3 on the integrated tree).
Deviations from the brief (with reasons) — additions to v1's list 1-13
- The knob latches key on the value, not "once per process" (
PipeFill.cpp; the brief/contract said "parsed once at the first fill"). Reason: without it no unit test can reach the parsers orFatal{PipeVerifyBadKnob}(review minor 4); lane behaviour is unchanged becauseFeaturesis loaded before the first fill. Cost is one empty-string compare and one Bool compare per fill in push/verify builds only. ArmVerifyresetsCorrupton re-arm — a consequence of 14 (a stale corruption must not outlive the knob value that named it).- v1 deviation 1's "nine guarded-expression sites" is now exactly nine: the tenth, undeclared one (
GL_Sync.cppDeleteSync sweep) was moved inside its guard rather than added to the list, because the siblingGL_Query.cppsweep already had the in-guard shape and D7 is satisfiable there at zero cost. PipeInputsTesthas 11 cases, not the brief's/v1's 5; the six additions are the review's minor 2 and minor 4 falsifiers.PipeCatalogueTestunchanged.OmittingOneFieldForOneVerbLeavesExactlyThatFieldStaleasserts the whole class mask (the brief's "verbatim shape" names two fields); superset of the brief's assertions.
Where the tree contradicted the brief's numbers
Unchanged from v1 (GL_Drawing.cpp:906 vs 907; RenderStateParameters 65 members not 67; CapabilityInput 35 not 37; c5 regenerates 1 file not 7; integration-gpu 868 not 371+3; the ctest -N regex needs the padded form). New in this round: none.
Records for the integrator (not A's code)
IsCapabilityEnabledIndexedasymmetry (review minor 5): the push accessor isFatalfor a cap other thanBlend/ScissorTest(PipeInputs.h, per D6 — the block carries only those two indexed caps), the pull arm returnsfalsewithMGLOG_I(RenderState.cpp). Unreachable today (VulkanRenderer.cppasksBlendonly); aMEASUREMENTS.mdline is the right place, so that a futureglIsEnabledi-driven backend read adds a field rather than tripping the Fatal.- CI negative-control regex (review section 5):
-R 'DirectGLES\.Verify\..*Mipmap'matches no integration test name on this tree, and E'sPoisonOmissionScenarioname has no "Mipmap"; with--no-tests=errorthe inverted step passes vacuously. The step should also grep the lane log forFatal{UnmigratedPipeInput, "GetActiveTextureUnit@GenerateMipmap"}. The unit-level G5 proof (ReadingAnOmittedFieldAbortsNamingTheVerb,PoisonOmitKnobArmsTheOmission) is independent of that regex. - Compare-at-read in D.3:
MutatedFieldIsNamedAtReadis the falsifier the review asked for; a D.3 run reporting zerowhere=readdivergences is now known to have a hook that fires when a value diverges. - The
GIT@stamp in the three libraries will refresh at the integrator's reconfigure on~/w7/pipe.
Unfinished
Nothing in A's scope. Every major and minor in core-review-v1.md is either fixed (M1, minors 1, 2, 3, 4, 8) or recorded above with the reason (minors 5, 6, 7 are bookkeeping/records by the reviewer's own classification).