simon/jolt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't abort startup on Windows resolving POSIX signal fns

Browse source 
joltc failed to start on Windows — "Exception in foreign-procedure: no entry for
pthread_sigmask". concurrency.ss resolves pthread_sigmask/sigemptyset/sigaddset at
load with a top-level (foreign-procedure …), which resolves its symbol eagerly;
those POSIX signal fns don't exist on Windows, so the whole runtime aborted.

Guard the three resolutions (like sched_yield/chmod already are) so a non-POSIX
host yields #f, and make jolt-set-sigint-blocked a no-op when they're unavailable.
The per-thread SIGINT mask is a POSIX-only optimization for the nREPL accept loop;
Windows delivers ^C through the console, and park-until-interrupt still parks on a
condition variable. macOS/Linux resolve the symbols as before — unchanged.
This commit is contained in:
Yogthos 2026-07-01 14:23:19 -04:00
parent 53112d06fb
commit cb03e36088
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
host/chez/java/concurrency.ss
View file

@ -547,10 +547,14 @@
;; sigaddset are libc/libpthread symbols, resolvable once the process object is ;; sigaddset are libc/libpthread symbols, resolvable once the process object is
;; loaded (as the socket fns already are). 128 bytes covers Linux's 1024-bit ;; loaded (as the socket fns already are). 128 bytes covers Linux's 1024-bit
;; sigset_t and is larger than macOS's 4-byte one. ;; sigset_t and is larger than macOS's 4-byte one.
;; foreign-procedure resolves its symbol eagerly, and these POSIX signal fns don't
;; exist on Windows — resolving them unguarded aborted startup ("no entry for
;; pthread_sigmask"). Guard so a non-POSIX host yields #f; jolt-set-sigint-blocked
;; then no-ops (Windows delivers ^C through the console, not a per-thread mask).
(define c-pthread-sigmask (define c-pthread-sigmask
(foreign-procedure "pthread_sigmask" (int u8* u8*) int)) (guard (e (#t #f)) (foreign-procedure "pthread_sigmask" (int u8* u8*) int)))
(define c-sigemptyset (foreign-procedure "sigemptyset" (u8*) int)) (define c-sigemptyset (guard (e (#t #f)) (foreign-procedure "sigemptyset" (u8*) int)))
(define c-sigaddset (foreign-procedure "sigaddset" (u8* int) int)) (define c-sigaddset (guard (e (#t #f)) (foreign-procedure "sigaddset" (u8* int) int)))
;; POSIX SIG_BLOCK/SIG_UNBLOCK numerics differ by platform: Linux/glibc 0/1, ;; POSIX SIG_BLOCK/SIG_UNBLOCK numerics differ by platform: Linux/glibc 0/1,
;; Darwin/macOS 1/2 (SIG_UNBLOCK is SIG_BLOCK+1 on both). Resolve SIG_BLOCK for ;; Darwin/macOS 1/2 (SIG_UNBLOCK is SIG_BLOCK+1 on both). Resolve SIG_BLOCK for
;; this host from the machine-type symbol — macOS builds contain "osx". ;; this host from the machine-type symbol — macOS builds contain "osx".
@ -563,12 +567,13 @@
((string=? (substring s i (+ i 3)) "osx") 1) ; Darwin/macOS ((string=? (substring s i (+ i 3)) "osx") 1) ; Darwin/macOS
(else (loop (+ i 1))))))) (else (loop (+ i 1)))))))
(define (jolt-set-sigint-blocked block?) (define (jolt-set-sigint-blocked block?)
(let ((set (make-bytevector 128 0)) (when (and c-pthread-sigmask c-sigemptyset c-sigaddset)
(old (make-bytevector 128 0))) (let ((set (make-bytevector 128 0))
(c-sigemptyset set) (old (make-bytevector 128 0)))
(c-sigaddset set 2) ; SIGINT = 2 (c-sigemptyset set)
(c-pthread-sigmask (if block? jolt-sig-block-how (+ jolt-sig-block-how 1)) set old) (c-sigaddset set 2) ; SIGINT = 2
jolt-nil)) (c-pthread-sigmask (if block? jolt-sig-block-how (+ jolt-sig-block-how 1)) set old)))
jolt-nil)
(def-var! "jolt.host" "call-on-main-thread" jolt-call-on-main-thread) (def-var! "jolt.host" "call-on-main-thread" jolt-call-on-main-thread)
(def-var! "jolt.host" "run-main-pump" jolt-run-main-pump) (def-var! "jolt.host" "run-main-pump" jolt-run-main-pump)