Replace the legacy Emscripten JS-exceptions model with native wasm-EH (legacy encoding) across the whole build, keeping Asyncify coroutines working via a from-source Binaryen --hoist-cpp-catches pre-pass. Net result: native-EH is the only build mode, the 3D viewer is on by default, and pcbnew shrinks substantially. Highlights: - Binaryen submodule everywhere + --hoist-cpp-catches integration in apply-asyncify; post-link Asyncify covers every app wasm (not just standalone test wasm). - Build deps (incl. OpenCASCADE without OCC_CONVERT_SIGNALS) and all KiCad apps with -fwasm-exceptions; emscripten_sleep added to the post-link asyncify-imports. - libcontext fiber entry wired under native exceptions; while-loop main loop + currData shim injected into all wx apps. - Native-EH collab apply fixed: DEBUG-define the embind TU + match all out-of-CMake C++ TUs' ABI flags to the core, fixing the vtable-layout skew / mis-dispatch. - 3D viewer enabled by default (real raytracer linked, not the stub). - Retire the EH-spike scaffolding; flip the asyncify-races ablation pins to shim-redundancy pins (native-EH stays clean with the legacy shims ablated). - Fix the asyncify-races quiescence check to not require Asyncify.currData==0: under the native-EH per-frame-yield top loop the main stack is asyncify-suspended every frame, so currData legitimately churns (a freed-but-not-yet-nulled buffer, not a leak). Refresh the pcbnew toolbar screenshot baseline for the new kicad. - CI: drop the obsolete binaryen_version input/env (the build uses the binaryen submodule fork's wasm-opt, not a version download); key the wasm-output cache on the binaryen submodule SHA instead. Bumps the wxwidgets + binaryen submodules to their squashed feature commits. Validated green: all 7 apps native-EH (real 3D in pcbnew); KiCad e2e 63/63 Firefox + Chromium (3D viewer renders); wx 336; coroutine 34/34 both engines; asyncify 7/7 both engines. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
73 lines
4.1 KiB
TypeScript
73 lines
4.1 KiB
TypeScript
import { test, expect } from './utils/fixtures';
|
|
|
|
// The BS-pool-API native-EH test (docs/features/wasm-exceptions/10 §6 #1).
|
|
//
|
|
// Unlike threadpool.spec.ts / coroutine-raytrace.spec.ts (which hand-roll raw std::thread),
|
|
// this drives KiCad's REAL pool: the app compiles in kicad/common/thread_pool.cpp and calls
|
|
// the actual GetKiCadThreadPool() (a BS::priority_thread_pool), with the detach_task
|
|
// __EMSCRIPTEN__ inline shim opted OUT via -DKICAD_WASM_REAL_THREADPOOL so tasks run on the
|
|
// pool's persistent pthread workers.
|
|
//
|
|
// The real pool is mode-a/b-safe by construction (persistent workers -> no on-demand spawn;
|
|
// futex busy-wait join -> no Asyncify nesting). The only native-EH risk is mode-c: a task
|
|
// that THROWS on a worker (caught by submit_task's promise wrapper ON the worker drives
|
|
// Asyncify under -fexceptions). So mode 6 is the decisive native-EH proof; modes 0-5 prove
|
|
// real multi-core (workersRan>1) across the API surface. Green => we can drop the shim.
|
|
//
|
|
// Named coroutine-* so playwright-coroutine.config.ts runs it in real Chrome + Firefox.
|
|
// WebKit is skipped for pthread apps (COEP worker-load limitation; doc 10 §2a).
|
|
|
|
const APP = '/standalone/threadpool-real/threadpool_real_test.html';
|
|
|
|
const MODES: { m: number; name: string }[] = [
|
|
{ m: 0, name: 'submit_task + vector<future> poll' },
|
|
{ m: 1, name: 'submit_loop + multi_future.wait' },
|
|
{ m: 2, name: 'submit_blocks (typed returns)' },
|
|
{ m: 3, name: 'detach_task + tp.wait()' },
|
|
{ m: 4, name: 'manual multi_future fanout by get_thread_count' },
|
|
{ m: 5, name: 'lifecycle: get_tasks_*/purge/wait + pause pool' },
|
|
];
|
|
|
|
function parse( logs: string[], mode: number ) {
|
|
const line = logs.find( l => l.includes( `[POOL] SUCCESS mode=${mode}` ) );
|
|
if( !line ) return null;
|
|
const w = line.match( /workersRan=(\d+)/ );
|
|
const c = line.match( /caught=(\d+)/ );
|
|
return { workersRan: w ? +w[1] : -1, caught: c ? +c[1] : -1 };
|
|
}
|
|
|
|
async function waitForLog( testLogger: { consoleLogs: string[] }, needle: string, timeout = 60000 ) {
|
|
await expect.poll( () => testLogger.consoleLogs.some( l => l.includes( needle ) ), { timeout } ).toBe( true );
|
|
}
|
|
|
|
test.describe( 'Real BS::thread_pool (GetKiCadThreadPool) — multi-core under native-EH', () => {
|
|
|
|
for( const { m, name } of MODES ) {
|
|
test( `mode ${m}: ${name} runs multi-core on the real pool`, async ( { page, testLogger } ) => {
|
|
await page.goto( `${APP}#m=${m}` );
|
|
await waitForLog( testLogger, `[POOL] SUCCESS mode=${m}` );
|
|
const r = parse( testLogger.consoleLogs, m )!;
|
|
expect( r.workersRan, 'tasks must run on >1 pool worker' ).toBeGreaterThan( 1 );
|
|
expect( testLogger.errors.filter( e => !e.includes( 'favicon' ) ), 'no runtime errors' ).toHaveLength( 0 );
|
|
} );
|
|
}
|
|
|
|
// mode-c: a task throws ON a worker; submit_task's promise wrapper catches it on the
|
|
// worker (drives Asyncify under -fexceptions -> "func is not a function" crash) and
|
|
// rethrows on main. Native wasm-EH decouples exceptions from Asyncify, so this must
|
|
// complete cleanly. (Red under JS-EH, green under native-EH — the contrast IS the proof.)
|
|
test( 'mode 6: throw on a worker is safe under native-EH and rethrows on main', async ( { page, testLogger } ) => {
|
|
await page.goto( `${APP}#m=6` );
|
|
// A worker throw is a mode-c crash under JS-EH and only safe under native wasm-EH, so this
|
|
// assertion is native-EH-only. The app reports its EH model early; skip on a JS-EH build
|
|
// (builds are always native-EH now, so this never skips) rather than asserting a crash.
|
|
await waitForLog( testLogger, '[POOL] EH=' );
|
|
test.skip( !testLogger.consoleLogs.some( l => l.includes( '[POOL] EH=native' ) ),
|
|
'throw-on-worker (mode-c) is native-EH-only; JS-EH build skips this assertion' );
|
|
await waitForLog( testLogger, '[POOL] SUCCESS mode=6' );
|
|
const r = parse( testLogger.consoleLogs, 6 )!;
|
|
expect( r.caught, 'the worker throw must rethrow + be caught on main' ).toBe( 1 );
|
|
expect( r.workersRan, 'workers still run a normal batch after the throw' ).toBeGreaterThan( 1 );
|
|
expect( testLogger.errors.filter( e => !e.includes( 'favicon' ) ), 'no mode-c crash' ).toHaveLength( 0 );
|
|
} );
|
|
} );
|