9c475a804e
The runtime is JSPI-only; this removes everything that still pretended otherwise. Three exhaustive sweeps (C++/JS+build+CI/tests+docs) drove the inventory; every deletion verified by grep closure + full gates. Broken-right-now fixes: - deploy-staging.yml passed the retired opt_level input — the workflow could not even start. Removed. - env.sh carried dead exports with a live -sASYNCIFY=1 inside (WASM_LDFLAGS/PTHREAD_LDFLAGS, zero consumers). Removed; the WASM_LEGACY_EXCEPTIONS rationale rewritten to the real reason. - docker/build.sh exported PCBJAM_ASYNC_BACKEND (read nowhere). Gone. Dead weight removed: - binaryen submodule (nothing builds or invokes it), wasm-opt-bench workflow + scripts/bench/, get-wasm-opt.sh, diagnostics.js (242 lines of Asyncify-API-only code), the KICAD_PIPELINE background-postprocess scaffolding (existed to parallelize the deleted wasm-opt phase; the postprocess is a seconds-long node script and now runs inline), build-monitor's dead asyncify rows, sched-context orphan build output, dead .gitignore entries, the .jspi-assets spike dir (the two wf-result research JSONs moved to docs/features/async/migration-evidence/). - bindings: fiber_park.h + its 12 embind registrations (broken-if- called under JSPI), the kicadOpenFileStart/OPEN_JOB starter route, main_stack_runner.h + 5 includes, the always-null context-sleep weak hook in nanosleep_yield.c. - shim: the backend field (installed-flag idempotency instead), noteContextWait (dead both sides), the __wxAsyncifyDump alias (+ the WasmTool fallback and string-dump normalize branch). - web: the emscripten-6-ignored mainScriptUrlOrBlob option in boot.ts (gerber-demo keeps it: it loads the deployed CDN release, which predates emscripten 6 — noted inline). Conditionals: all 'backend === jspi' checks reduced to scheduler- presence checks; races_quiescent re-keyed from Asyncify.state (vacuous) to real backlog quiescence (resumeReady/mutatorQueue — NOT _windowLive, which is the probing activation's own window by definition). Renames (identifiers only, no file renames): ASYNC_LINK_FLAGS→ JSPI_LINK_FLAGS and Makefile ASYNC_LDFLAGS→JSPI_LDFLAGS, kicadCollabFiberBusy→kicadCollabBusy (embind + web + tests), collab_common.h fiber*→apply*/coroutine naming, asyncifySignatures→ wasmTrapSignatures (lists byte-identical). Tests: the two remaining vacuous [wx-asyncify]/fiber-resume-refused asserts re-keyed to live JSPI beacons; eeschema-load's failure message no longer sends the developer to a deleted script; wait-beacons' dead families/parser deleted; lane-0 legacy-glue guards removed (lane 0 is unconstructible); the embind test.fail re-gated with the JSPI reason (plain embind invokers cannot suspend — verified still failing); lint-determinism now scans tests/jspi (166 files clean); eeschema-collab local-move gated to chromium (~50% flaky on FF even solo; pcbnew twin covers both engines). Docs: DEBUG.md rewritten as the JSPI debugging guide; build.md describes the single-phase build; docs/features/async/README.md banner-marked historical and repointed at the NEW 23-jspi-runtime.md (current architecture: export census, turnstile, libcontext ownership + refusal contract, embind call shapes, the em-pthread service-wrapper trick, exception policy, known gaps). Gates on the cleaned tree: test:e2e 725 passed / 0 failed (after the quiescence-probe fix; the 3 other reds were verified contention flakes solo-green or the documented FF gate), web 76/0, jspi 18/18 both engines, vitest 295/295 + 17/17, all lints green, live-app census clean. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016X9eh1s5sTx1o9Em9KBuwR
71 lines
3.4 KiB
CMake
71 lines
3.4 KiB
CMake
# occ_service — standalone OpenCASCADE 3D service for the browser build
|
|
# (docs/features/occ-split/): STEP/3D export and STEP/IGES model tessellation
|
|
# as a separate emscripten module run in a Web Worker, so the editor drops its
|
|
# OCC link entirely.
|
|
#
|
|
# Added from the kicad fork's top-level CMakeLists.txt via
|
|
# add_subdirectory( ${KICAD_WASM_LAYER}/occ-service ) when
|
|
# EMSCRIPTEN AND KICAD_OCC_SERVICE_WASM — after pcbnew/, so the kiface library
|
|
# list and the OCC exporter source list (both exported CACHE INTERNAL there)
|
|
# exist here. Same pattern as the merged editor (wasm/editor/CMakeLists.txt).
|
|
# Only the occ_service build tree configures with the option ON; its binary
|
|
# dir doubles as the artifact subdir (build-wasm/kicad-occ_service/occ_service/).
|
|
|
|
# Mirror the pcbnew directory scope these sources were written for: the OCC
|
|
# exporters and the service main are pcbnew-kiface code (board classes, 3d
|
|
# resolver, exporter headers). OCC headers arrive via the top-level
|
|
# include_directories( SYSTEM ${OCC_INCLUDE_DIR} ); nlohmann_json/gzip-hpp via
|
|
# their INTERFACE targets.
|
|
include_directories( BEFORE ${INC_BEFORE} )
|
|
include_directories(
|
|
${CMAKE_SOURCE_DIR}/pcbnew
|
|
${CMAKE_SOURCE_DIR}/pcbnew/dialogs
|
|
${CMAKE_SOURCE_DIR}/pcbnew/exporters
|
|
${CMAKE_SOURCE_DIR}/pcbnew/specctra_import_export
|
|
${CMAKE_SOURCE_DIR}/3d-viewer
|
|
${CMAKE_SOURCE_DIR}/common
|
|
${CMAKE_SOURCE_DIR}/common/dialogs
|
|
${CMAKE_BINARY_DIR}/pcbnew
|
|
${INC_AFTER}
|
|
)
|
|
|
|
# The exporter sources expect the pcbnew compile environment.
|
|
add_compile_definitions( PCBNEW )
|
|
|
|
# The OCC exporter sources are gated out of the kiface objects for EMSCRIPTEN
|
|
# (pcbnew/CMakeLists.txt) — the service compiles the real ones itself.
|
|
add_executable( occ_service
|
|
occ_service_main.cpp
|
|
${PCBNEW_OCC_EXPORTER_SRCS} )
|
|
|
|
target_link_libraries( occ_service
|
|
PRIVATE
|
|
${PCBNEW_KIFACE_LIBRARIES}
|
|
nlohmann_json
|
|
gzip-hpp # step_pcb_model.cpp (.stpZ/.gz) — kiface-PRIVATE, so restate
|
|
)
|
|
# Match the editors' WASM link shape: allow benign duplicate symbols, and
|
|
# --whole-archive pcbcommon so RTTI-only-referenced vtables/typeinfo are
|
|
# pulled in.
|
|
target_link_options( occ_service PRIVATE
|
|
"LINKER:--allow-multiple-definition"
|
|
"LINKER:--whole-archive"
|
|
"$<TARGET_FILE:pcbcommon>"
|
|
"LINKER:--no-whole-archive"
|
|
)
|
|
|
|
# Persistent worker embind module: neither OCC job suspends, so no JSPI.
|
|
# -Oz at link runs wasm-opt -Oz = whole-module dead-code elimination that
|
|
# strips the unreachable editor code (same mechanism sym_convert documents
|
|
# in eeschema/CMakeLists.txt); -g0 drops debug info so in-container
|
|
# finalize doesn't OOM. MODULARIZE factory booted by the JS provider inside
|
|
# a dedicated Worker; node kept in ENVIRONMENT so unit tests can drive it.
|
|
# These override the browser-oriented values inherited from
|
|
# CMAKE_EXE_LINKER_FLAGS. The inherited FULL pthread pool
|
|
# ('navigator.hardwareConcurrency') is kept deliberately: the exporter
|
|
# uses GetKiCadThreadPool (step_pcb_model.cpp), and a browser cannot spawn
|
|
# workers on demand while the calling thread is blocked inside occExport —
|
|
# an undersized pool deadlocks in Chromium.
|
|
# --pre-js supplies the wxConfig JS hooks backed by an in-memory store.
|
|
set_target_properties( occ_service PROPERTIES
|
|
LINK_FLAGS "-Oz -g0 -sMODULARIZE=1 -sEXPORT_NAME=OccService -sENVIRONMENT=worker,node -sEXIT_RUNTIME=0 --pre-js ${CMAKE_CURRENT_SOURCE_DIR}/occ_service_pre.js" )
|