Skip to content

Commit 2c28312

Browse files
committed
chore(gates): keep the admission audit at base after the re-route (#3220)
The re-route's loader-read members join the existing dynamic-member suppression, and the redirect lookup becomes module-internal: the lock task reads the same verdict through rerouteSettledRunnerStart, so no cross-module seam needed it.
1 parent 3e235a9 commit 2c28312

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

‎.fallowrc.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,11 @@
254254
"comment": "The start-admission fence members are read off the loadRunnerStartAdmission() loader in packages/platform-apple/src/runner/{runner-session,runner-artifact}.ts (the eager-closure budget forbids the static edge); Fallow cannot connect those dynamic member reads.",
255255
"file": "packages/platform-apple/src/runner/runner-start-admission.ts",
256256
"exports": [
257+
"retireRunnerStartAdmissionForDevice",
258+
"clearRunnerStartAdmissionAfterTeardown",
257259
"retireAllRunnerStartAdmissions",
258260
"clearAllRunnerStartAdmissionsAfterTeardown",
261+
"rerouteSettledRunnerStart",
259262
"assertRunnerStartAdmitsPreparation"
260263
]
261264
},

‎packages/platform-apple/src/runner/runner-session.ts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@ export async function ensureRunnerSession(
113113
// not that teardown's retry: it is re-routed to a new admission, keeping its waiter
114114
// interest live. A start woken WHILE the fence still governs the device is refused here,
115115
// before it adopts, boots, or builds (#3220).
116-
const {
117-
rerouteSettledRunnerStart,
118-
liveRunnerStartAdmission,
119-
assertRunnerStartAdmitsPreparation,
120-
} = await loadRunnerStartAdmission();
121-
const startAdmission = liveRunnerStartAdmission(
122-
rerouteSettledRunnerStart(device.id, capturedAdmission) ?? capturedAdmission,
123-
);
116+
const { rerouteSettledRunnerStart, assertRunnerStartAdmitsPreparation } =
117+
await loadRunnerStartAdmission();
118+
// `rerouteSettledRunnerStart` answers every live case; an admission it refuses is closed
119+
// either way, so the refusal falls out of the assert below (#3220).
120+
const startAdmission =
121+
rerouteSettledRunnerStart(device.id, capturedAdmission) ?? capturedAdmission;
124122
assertRunnerStartAdmitsPreparation(device.id, startAdmission);
125123
// One budget for the whole start, opened once the lock is held so a start queued behind
126124
// another does not spend its clock waiting: the reuse check's toolchain probes, adoption and

‎packages/platform-apple/src/runner/runner-start-admission.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export function rerouteSettledRunnerStart(
138138
* The admission a waiter's cancellation must act on: a re-routed start's work runs under the
139139
* fresh admission, so interest recorded on the captured one is followed to where it counts.
140140
*/
141-
export function liveRunnerStartAdmission(admission: RunnerStartAdmission): RunnerStartAdmission {
141+
function liveRunnerStartAdmission(admission: RunnerStartAdmission): RunnerStartAdmission {
142142
let current = admission as StartAdmission;
143143
while (current.redirectedTo) current = current.redirectedTo;
144144
return current;

0 commit comments

Comments
 (0)