7.9 KiB
s1 — round 2, ID-43 only
Branch p5/s1, worktree ~/w7/p5-s1.
Step 0 (ID-44): git var GIT_COMMITTER_IDENT = Swung0x48 <swung0x48@outlook.com> (ID-40, OK);
git merge --no-edit feat/disaggregated (5e5bf7b9) was a fast-forward — p5/s1's round-1 head
f33e5d60 was already an ancestor of the integration head, so this round adds exactly one commit on
top of 5e5bf7b9 and carries no merge resolution of its own.
Commit: 4ba14fa4 — [Test] (MG_Test, Wire): ID-43 - ..., one file,
MobileGL/MG_Test/Wire/RingTest.cpp, +60 / −8. No source file, no other test file, nothing
outside MG_Test/Wire/. PipeWireCodecTest.cpp untouched.
1. Reproduction, before anything was changed
cd build-split && ctest -R 'RingTest.TheTwoFlagSpacesAreDisjointByTranslation' --output-on-failure
on the merged head:
../MobileGL/MG_Test/Wire/RingTest.cpp:774: Failure
Value of: ring.Consumer().Pop(view)
Actual: true
Expected: false
a header stamped with the CALL flags outside Reserve should vanish into Pop's wrap-filler skip - ...
Exactly ID-43: c0's control (now 6e858fa3) states the pre-f33e5d60 tree. RingProducer::Reserve
masks kRecPad out, so the first half of the case is untouched by my round-1 fix; the second
half hand-stamps the header past Reserve, and since RingConsumer::Pop now requires
kind == kRingPadRecordKind beside the flag (Transport/Ring.cpp:272), the DrawVbo-kind record is
no longer eaten as a filler — it is delivered.
2. What the case says now
The first half (the Reserve-masked path, RingTest.cpp:736-757) is not weakened: same
ASSERT_TRUE(Pop), same EXPECT_EQ(flags & kRecPad, 0), same EXPECT_NE(flags & kRecBorrowSlot, 0),
same Invariants(). Only the second half and one stale comment moved.
EXPECT_FALSE(Pop)→ASSERT_TRUE(Pop), with a message that names the kind check as the defence: "the stamped record vanished into Pop's wrap-filler skip. Pop's kind check — a filler must carry kind == kRingPadRecordKind as well as kRecPad — is the only thing standing between a header stamped with the CALL flags and every var-tail call being deleted from the stream with nothing logged on either side."EXPECT_EQ(view.kind, MGPWireOp::DrawVbo)— the kind is what Pop tells a record from a filler by.- The flags, stated exactly and by their translated names.
MGPipeCallFlagsFor(MGPWireOp::DrawVbo)iskHostSpan|kVarTail(PipeCalls.def:184) =0x0C, and it arrives verbatim:EXPECT_EQ(view.flags, drawVboCallFlags)— the header arrived as stamped;EXPECT_NE(flags & kRecPad, 0)— bit 2, thekVarTailcollision, is still set. The kind check narrows the skip; it does not scrub the bit. Naming the record is the decoder's job, and it can only do that because it got the record.EXPECT_NE(flags & kRecBorrowSlot, 0)— bit 3, thekHostSpancollision, the lie about this record's lifetime (same wording as the first half already uses).EXPECT_EQ(flags & kRecVarTail, 0)— bit 4. Note for the integrator: ID-43's text says the "lyingkRecBorrowSlot/kRecVarTailbits" are visible.kRecVarTailiskReplySlot's bit anddraw_vbois not a reply-slot call, so that bit is clear here, in the stamped half exactly as in theReservehalf. The case now pins it clear and says why, sodraw_vbogrowingkReplySlotis a red here rather than a silent change of what this case demonstrates.EXPECT_EQ(view.payloadSize, 16u)andEXPECT_TRUE(ring.Invariants()).
- The other side of the control, new: a header hand-stamped with
kRecPadwhose kind iskRingPadRecordKindis still skipped (EXPECT_FALSE(Pop)),Invariants()still holds. Without it, "the record is popped" could be satisfied by deleting the wrap-filler skip outright. Together the two halves say the whole ruling: same bit, different kind, different fate. - The stale prose at
RingTest.cpp:704-709(thestatic_asserttable's "the middle one is the worst:PoptreatskRecPadas a wrap filler and SKIPS the record") now reads in the conditional — that is what would happen on the flag alone — and points at the runtime half as the control. Thestatic_asserts themselves are unchanged.
3. I made it red once, by doing X
X = deleting the kind half of Pop's wrap-filler condition, one line,
MobileGL/MG_Remote/Transport/Ring.cpp:272:
- if ((header.flags & kRecPad) != 0 && header.kind == kRingPadRecordKind) {
+ if ((header.flags & kRecPad) != 0) { // P5-S1-REDCHECK: kind check removed
Rebuilt build-split (rc=0) and re-ran the case. It went red on its own message, at the new
assertion and nowhere else:
../MobileGL/MG_Test/Wire/RingTest.cpp:784: Failure
Value of: ring.Consumer().Pop(view)
Actual: false
Expected: true
the stamped record vanished into Pop's wrap-filler skip. Pop's kind check - a filler must carry
kind == kRingPadRecordKind as well as kRecPad - is the only thing standing between a header stamped
with the CALL flags and every var-tail call being deleted from the stream with nothing logged on
either side
Reverted with git checkout -- MobileGL/MG_Remote/Transport/Ring.cpp; git status --porcelain
then listed MobileGL/MG_Test/Wire/RingTest.cpp and nothing else, and the line at Ring.cpp:272 is
back to the pair. build-split and build-push were rebuilt from the reverted tree before any
number below was taken — no verdict here comes from a perturbed binary.
4. Numbers (all at 4ba14fa4)
| lane | result |
|---|---|
the case itself, build-split |
Passed |
ctest -R '^Ring|^Doorbell|^Framing|^FdPassing|^InProcessTransport|^Protocol', build-split |
58 / 58 |
ctest -L unit, build-push |
1813 / 1813 |
ctest -L unit, build-split |
1974 total, 1 failed — PipeWireCodecTest.NoReplyIsWrittenForARowTheCatalogueGivesNoReplySlot (#1947), c1's, ID-43's closing paragraph. Nothing else red, nothing aborted, nothing timed out. |
| builds | build-push rc=0, build-split rc=0, build-linux (pull) rc=0; CTestTestfile.cmake confirmed present in each before any verdict |
G1 symbol_report.py --before ~/w7/p5-before-libMobileGL.so --after build-linux/libMobileGL.so --threshold 0 |
.text 10806611 -> 10806611 (+0, +0.000%); 27814 -> 27814 defined symbols: **0 added, 0 removed, 0 resized, 0 renamed**. Baseline marker ~/w7/p5-before-libMobileGL.so.READY = 4595163c present (ID-44), so this is against the re-taken baseline. |
nm role check |
pull build MG_Remote symbols 0 |
| flake | ctest -R '^RingTest' -j 8 --repeat-until-fail 20 — 22 / 22, 0 failing reps |
RingTest is 22 cases in build-split (21 pre-P5 + c0's one). This round adds no case and
removes none; the counts above are the merged head's counts, not a delta of mine.
Logs kept: ~/w7/p5-s1-r2-push-unit.log, ~/w7/p5-s1-r2-split-unit.log. Everything else under the
p5-s1-r2- prefix was deleted.
5. For the integrator
- ID-43 is closed.
f33e5d60'sPopchange stands as production behaviour; the test states it, and the control is two-sided (kRecPad+ kind 0 vanishes,kRecPad+DrawVbois delivered), so neither "delete the kind check" nor "delete the skip" can pass it. - The one wording correction to ID-43 is in §2.3 above:
kRecVarTailis not among the bits a stampeddraw_vboheader lies with, becausedraw_vbocarries nokReplySlot. The case now pins that bit clear rather than asserting it set. - Nothing outside
MG_Test/Wire/RingTest.cppchanged, so nothing here interacts with c1's:1203red, with b1's ID-41/ID-42, or with v1's resumed work-in-progress. The split-unit red count onp5/s1is exactly one and it is c1's. f33e5d60's other pins of the same ruling are untouched and still green:SessionTest.ARecordWearingThePadBitIsDeliveredRatherThanEatenAsAFillerandSessionTest.ABorrowSlotSightingIsCountedRatherThanJustActedOn.