findings(E-5,E-6): validation-round fixes — live e2e falsified two ported shapes
E-5: the module-identity bridge called installingModule._malloc, but this build exposes _malloc only as a bare glue-closure export (Module._malloc is absent) — every char/stat event entry threw TypeError, which also starved the E-6 credit window (thrown dispatches never acked) and wedged the queued bg-finished frame behind them. The bridge now uses the bare closure exports (identity is still exact: the EM_JS body IS the installing module's closure; the __ngspiceOnEvent self-disarm covers supersession). E-6 (codex reference design corrected — its validation matrix never ran): a FULL credit window was terminal (stopEventStream at 64 in-flight frames). Under live e2e that killed a real simulation: bg-thread emissions proxy one per task, so each line ships as its own frame and a normal transient outruns a busy main thread. A full window now DEFERS into a bounded FIFO (512 events / 4 MiB) drained in order as acks free credit; only true overload or an invalid ack is terminal. Retention stays bounded (8 MiB in flight + 4 MiB deferred + 1 MiB open batch). And the service/harness mirror queue now acks at ENQUEUE — placing a frame in the bounded pre-handler queue is taking ownership; without that, a stream starting before the C++ handler installs (the ngspice-probe page) starves the worker window forever. Test updates: worker-batch reducer — new "a full credit window defers and drains in order, never terminal" case pinning the regression; the storm case now proves the deferred caps are the terminal edge. board-ready.ts gains the owner-free openBoardProgrammatically (codex helper the ported occ-export spec needs; the barrier-based waitForUiBoardReady was NOT taken). occ-export.spec: domId is optional on this line's registry (coordinate fallback is the supported path). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
c14e76651c
commit
06a46546cc
7 changed files with 180 additions and 21 deletions
|
|
@ -173,8 +173,8 @@ export function installNgspiceService(
|
|||
const queued = evtQueue.shift()!;
|
||||
evtQueueBytes -= queued.bytes;
|
||||
if (queued.generation !== slot.generation) continue;
|
||||
// Queued frames were acked at enqueue (ownership was taken then).
|
||||
handler(queued.evt);
|
||||
if (!ackEvent(slot, queued)) return;
|
||||
}
|
||||
handler(evt);
|
||||
ackEvent(slot, frame);
|
||||
|
|
@ -186,6 +186,12 @@ export function installNgspiceService(
|
|||
}
|
||||
evtQueue.push(frame);
|
||||
evtQueueBytes += bytes;
|
||||
// Enqueueing IS taking ownership: the frame now lives in this bounded
|
||||
// mirror queue, so its transport credit is released — otherwise a
|
||||
// stream that starts before the C++ handler installs starves the
|
||||
// worker's window forever. The queue caps above stay the pre-handler
|
||||
// bound (M-6: count + bytes).
|
||||
ackEvent(slot, frame);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -58,18 +58,26 @@ const modP = NgspiceService({
|
|||
// either limit. bg/exit events flush first so relative order is preserved.
|
||||
// E-6: batches are cut at MAX_EVENT_BATCH_* and posting is gated by the
|
||||
// MAX_EVENT_UNACKED_* credit window — the host acks each frame with its exact
|
||||
// { sequence, bytes } after taking ownership.
|
||||
// { sequence, bytes } after taking ownership. A FULL window is backpressure,
|
||||
// not a fault: frames that cannot post are DEFERRED (bounded by the
|
||||
// MAX_DEFERRED_* caps) and drained in order as acks free credit — a busy main
|
||||
// thread mid-plot-apply must slow the stream down, never kill the simulator.
|
||||
// Only true overload (deferred caps exceeded) or an invalid ack is terminal.
|
||||
const EVT_CHAR = 0, EVT_STAT = 1, EVT_BG = 2, EVT_EXIT = 3;
|
||||
const MAX_EVENT_BATCH_LINES = 512;
|
||||
const MAX_EVENT_BATCH_UTF8_BYTES = 1024 * 1024;
|
||||
const MAX_EVENT_UNACKED_FRAMES = 64;
|
||||
const MAX_EVENT_UNACKED_UTF8_BYTES = 8 * 1024 * 1024;
|
||||
const MAX_DEFERRED_EVENTS = 512;
|
||||
const MAX_DEFERRED_UTF8_BYTES = 4 * 1024 * 1024;
|
||||
let pendingLines = null; // { kind, lines, utf8Bytes } of the open batch
|
||||
let flushQueued = false;
|
||||
let eventStreamFailure = null;
|
||||
let nextEventSequence = 1;
|
||||
let unackedEventBytes = 0;
|
||||
const unackedEvents = new Map();
|
||||
const deferredEvents = []; // [{ evt, eventBytes }] awaiting credit, FIFO
|
||||
let deferredEventBytes = 0;
|
||||
|
||||
function utf8Bytes(text) {
|
||||
let bytes = 0;
|
||||
|
|
@ -139,29 +147,28 @@ function flushLines() {
|
|||
|
||||
function stopEventStream(reason) {
|
||||
if (!eventStreamFailure) {
|
||||
// Detach the not-yet-transferred batch before reporting terminal state.
|
||||
// Frames already posted remain bounded by the unacknowledged credit set.
|
||||
// Detach the not-yet-transferred batch and the deferred queue before
|
||||
// reporting terminal state. Frames already posted remain bounded by the
|
||||
// unacknowledged credit set.
|
||||
pendingLines = null;
|
||||
flushQueued = false;
|
||||
deferredEvents.length = 0;
|
||||
deferredEventBytes = 0;
|
||||
eventStreamFailure = reason;
|
||||
postMessage({ fatal: reason });
|
||||
}
|
||||
throw new RangeError(eventStreamFailure);
|
||||
}
|
||||
|
||||
function postEvent(evt) {
|
||||
const eventBytes = utf8Bytes(JSON.stringify(evt));
|
||||
if (unackedEvents.size >= MAX_EVENT_UNACKED_FRAMES
|
||||
|| eventBytes > MAX_EVENT_UNACKED_UTF8_BYTES
|
||||
|| unackedEventBytes > MAX_EVENT_UNACKED_UTF8_BYTES - eventBytes) {
|
||||
stopEventStream(
|
||||
`ngspice event transport exceeded ${MAX_EVENT_UNACKED_FRAMES} frames or `
|
||||
+ `${MAX_EVENT_UNACKED_UTF8_BYTES} unacknowledged UTF-8 bytes`);
|
||||
}
|
||||
function creditAvailable(eventBytes) {
|
||||
return unackedEvents.size < MAX_EVENT_UNACKED_FRAMES
|
||||
&& unackedEventBytes <= MAX_EVENT_UNACKED_UTF8_BYTES - eventBytes;
|
||||
}
|
||||
|
||||
function transmitEvent(evt, eventBytes) {
|
||||
if (nextEventSequence > Number.MAX_SAFE_INTEGER) {
|
||||
stopEventStream("ngspice event sequence space exhausted");
|
||||
}
|
||||
|
||||
const eventSequence = nextEventSequence++;
|
||||
unackedEvents.set(eventSequence, eventBytes);
|
||||
unackedEventBytes += eventBytes;
|
||||
|
|
@ -174,6 +181,39 @@ function postEvent(evt) {
|
|||
}
|
||||
}
|
||||
|
||||
function postEvent(evt) {
|
||||
const eventBytes = utf8Bytes(JSON.stringify(evt));
|
||||
if (eventBytes > MAX_EVENT_UNACKED_UTF8_BYTES) {
|
||||
stopEventStream(
|
||||
`ngspice event frame exceeds ${MAX_EVENT_UNACKED_UTF8_BYTES} UTF-8 bytes`);
|
||||
}
|
||||
// A full credit window defers the frame (FIFO — never overtake an already
|
||||
// deferred frame). Deferral is bounded; exceeding the caps means the host
|
||||
// has stopped consuming entirely, which IS terminal.
|
||||
if (deferredEvents.length > 0 || !creditAvailable(eventBytes)) {
|
||||
if (deferredEvents.length >= MAX_DEFERRED_EVENTS
|
||||
|| deferredEventBytes > MAX_DEFERRED_UTF8_BYTES - eventBytes) {
|
||||
stopEventStream(
|
||||
`ngspice event transport exceeded ${MAX_EVENT_UNACKED_FRAMES} in-flight `
|
||||
+ `frames plus ${MAX_DEFERRED_EVENTS} deferred events `
|
||||
+ `(${MAX_DEFERRED_UTF8_BYTES} deferred UTF-8 bytes)`);
|
||||
}
|
||||
deferredEvents.push({ evt, eventBytes });
|
||||
deferredEventBytes += eventBytes;
|
||||
return;
|
||||
}
|
||||
transmitEvent(evt, eventBytes);
|
||||
}
|
||||
|
||||
function drainDeferredEvents() {
|
||||
while (deferredEvents.length > 0
|
||||
&& creditAvailable(deferredEvents[0].eventBytes)) {
|
||||
const next = deferredEvents.shift();
|
||||
deferredEventBytes -= next.eventBytes;
|
||||
transmitEvent(next.evt, next.eventBytes);
|
||||
}
|
||||
}
|
||||
|
||||
function acknowledgeEvent(ack) {
|
||||
const sequence = ack && ack.sequence;
|
||||
const bytes = ack && ack.bytes;
|
||||
|
|
@ -185,6 +225,7 @@ function acknowledgeEvent(ack) {
|
|||
}
|
||||
unackedEvents.delete(sequence);
|
||||
unackedEventBytes -= bytes;
|
||||
drainDeferredEvents();
|
||||
}
|
||||
|
||||
function onEmit(kind, text, a, b) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue