mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-18 15:33:22 +09:00
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.
106 lines
6.5 KiB
Markdown
106 lines
6.5 KiB
Markdown
# p1-v2 — wave 1.5, ID-48 finding 9: `gen_pipe.py`'s `expect_trip` accepted any `SystemExit`
|
|
|
|
## 0. The one-paragraph answer
|
|
|
|
Same defect as M-1 in `gen_pipe_field_ownership.py` (p1-v1.md §7.1), found again in the sibling
|
|
generator by the codex cross-family review (finding 9) and confirmed by execution
|
|
(`wave1-codex-verify.md` §9, including the exit-code-zero half). `scripts/gen_pipe.py`'s
|
|
`expect_trip` (`:1379`) caught bare `except SystemExit as trip` and asked nothing about which one
|
|
or what code it carried, so replacing the flag-typo control's callback (`:1424`) with
|
|
`sys.exit("unrelated parser failure")` — or with a **successful** `sys.exit(0)` — still counted as
|
|
"tripped as expected", and the harness's own line ("9 negative-control trip(s), positive control
|
|
OK") stayed true. Fixed by mirroring the field-ownership generator's shape exactly, plus an R-16
|
|
meta-control. Only `scripts/gen_pipe.py` was touched. No C++ changed.
|
|
|
|
## 1. What changed
|
|
|
|
`expect_trip(name, fn)` -> `expect_trip(name, because, fn, quiet=False)`:
|
|
|
|
- Catches `SystemExit`, reads `trip.code`.
|
|
- A trip counts **only if `code != 0` AND `because in str(code)`** — the guard's own message,
|
|
not merely that something exited. `because` is required, not inferred.
|
|
- `quiet=True` lets a caller probe an exit without it printing as a real control result (used by
|
|
the R-16 meta-control below, so that meta-control cannot itself inflate the trip count).
|
|
|
|
Each of the nine controls in `self_test()` now carries its own `because` substring, read off the
|
|
actual guard it exercises (verified by running the unfixed generator and reading the real
|
|
messages, not guessed):
|
|
|
|
| # | control | `because` |
|
|
|---|---|---|
|
|
| 1 | struct member without F(...) | `member(s) with no F(...) in PipeFields.def` |
|
|
| 2 | F(...) that is not a member | `F(...) name(s) that are not members` |
|
|
| 3 | payload with no struct | `struct not found` |
|
|
| 4 | verb missing from FillPoints.def | `GLFunctionsTable member(s) without a verb row` |
|
|
| 5 | verb not a GLFunctionsTable member | `verb(s) that are not GLFunctionsTable members` |
|
|
| 6 | field row naming a non-accessor | `is not an accessor in Coverage.def` |
|
|
| 7 | emitted row naming a call that does not exist | `which is not a call in PipeCalls.def` |
|
|
| 8 | call flag not an MGPipeCallFlags enumerator | `which is not an MGPipeCallFlags enumerator` |
|
|
| 9 | kNone combined with a real flag | `combines kNone with` |
|
|
|
|
**R-16 meta-control**, added inside `self_test()` right after control #9 is appended (not one of
|
|
the nine — it runs `expect_trip(..., quiet=True)` directly and `sys.exit`s by hand if either
|
|
probe is wrongly accepted, so it cannot inflate `trips`/`len(controls)`): using control #8's own
|
|
`because` (`flag_typo_because`), it asserts that swapping the real callback for
|
|
`lambda: sys.exit("unrelated parser failure")` is REJECTED, and separately that
|
|
`lambda: sys.exit(0)` is REJECTED. This is exactly the review's two perturbations (finding 9 /
|
|
`wave1-codex-verify.md` §9), reused as the permanent regression guard rather than thrown away.
|
|
|
|
## 2. The red-once line
|
|
|
|
Reverting `expect_trip`'s body to the pre-fix shape (`except SystemExit as trip: return 1`,
|
|
signature otherwise kept) while leaving everything else untouched turns `--self-test` red: the
|
|
R-16 meta-control's first probe (the unrelated-diagnostic swap) is silently accepted by the
|
|
reverted function, and the meta-control's own `sys.exit` fires —
|
|
`"expect_trip counted an UNRELATED SystemExit as the flag-typo guard's own trip - finding 9 / R-16
|
|
is back"` — nonzero exit, confirmed with an `if`/`else` control-flow check (not `$?`, which this
|
|
WSL shell does not propagate reliably through a chained `bash -lc '...; echo $?'`; `if cmd; then
|
|
... else ... fi` was used throughout for every pass/fail check in this round). Restoring the fix
|
|
turns it back to green with no other change.
|
|
|
|
## 3. Self-test counts, before and after
|
|
|
|
- `gen_pipe.py --self-test`: **9 negative-control trip(s), positive control OK** before AND
|
|
after — the printed count is unchanged text, because the fix changes what a trip *means*
|
|
(the guard's own message, code != 0), not how many controls exist. The R-16 meta-control is
|
|
deliberately outside that count, matching how `gen_pipe_field_ownership.py`'s own harness
|
|
control is not part of its "15 controls" total.
|
|
- `gen_pipe.py --check`: generated files unchanged — `gen_pipe: generated files are up to date`
|
|
(harness-only change, zero generator-output diff, as required).
|
|
- `gen_pipe_field_ownership.py --self-test`: unaffected, still **15 negative-control trip(s),
|
|
each asserted against its OWN message; harness control OK; positive control OK**.
|
|
- `gen_pipe_dirty_surface.py --self-test`: unaffected, still **27 negative controls, all
|
|
tripped; positive controls OK**.
|
|
|
|
## 4. t1's CI step
|
|
|
|
`.github/workflows/test.yml:2253` (`The MGPipe generators' checks can still fail`) runs
|
|
`python3 scripts/gen_pipe.py --self-test` and gates on its exit code alone — it does not grep or
|
|
pin the "9 negative-control trip(s)" string anywhere. **No CI step or expected count needs to
|
|
change.** (Not touched, per the iron rule that `test.yml` is t1's.)
|
|
|
|
## 5. G1 / C++
|
|
|
|
Not touched. Only `scripts/gen_pipe.py` changed (a harness-only diff: `expect_trip`'s signature
|
|
and body, and the nine controls' `because` arguments plus the R-16 meta-control — no generator
|
|
OUTPUT changed, confirmed by `--check` above). No `.inc` file, no `.def` file, no C++ source
|
|
differs from `ce53553c`. No build was run; none was needed to establish this — `--check`'s
|
|
byte-identical result is the stronger claim (it covers every generated file, not just the ones a
|
|
particular build happens to compile), and G1 (`symbol_report.py`) only has meaning against a
|
|
libMobileGL.so built from changed C++, of which there is none this round.
|
|
|
|
## 6. Step 0 / merge
|
|
|
|
`git var GIT_COMMITTER_IDENT` printed `Swung0x48 <swung0x48@outlook.com>` before the first commit
|
|
(ID-40 satisfied). `p5/p1` was fast-forwarded from `3aa48bcc` (wave-1 landing) to `ce53553c`
|
|
(`feat/disaggregated`, ID-44's baseline, wave-2's `p5/b1` round 2 / ID-41+ID-42) with
|
|
`git merge --no-edit feat/disaggregated` — a clean fast-forward, 70 files touched by the merge,
|
|
none of them `scripts/gen_pipe*.py`.
|
|
|
|
## 7. Commit
|
|
|
|
`7110cdb6` `[Fix] (scripts): make gen_pipe.py's expect_trip require the tripped guard's own
|
|
message and a non-zero exit code, with an R-16 meta-control that an unrelated SystemExit or
|
|
sys.exit(0) cannot pass as a trip - the any-SystemExit defect fb70704e fixed in the
|
|
field-ownership generator, confirmed still present here by codex review finding 9`
|