X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-signal.lisp;h=0d754e541daf96c450542648c922383c80759098;hb=f98d63ddb86859259bf12f2e276fb577cbe168eb;hp=a920f15da921d9e9314d1b4533154cd876db9753;hpb=c2bce3b9eb9f51fb0657af3c9023fff86ba3a51f;p=sbcl.git diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp index a920f15..0d754e5 100644 --- a/src/code/target-signal.lisp +++ b/src/code/target-signal.lisp @@ -17,26 +17,20 @@ ;;;; system calls that deal with signals +;;; Send the signal SIGNAL to the process with process id PID. SIGNAL +;;; should be a valid signal number #!-sb-fluid (declaim (inline real-unix-kill)) -(sb!alien:define-alien-routine ("kill" real-unix-kill) sb!alien:int +(sb!alien:define-alien-routine ("kill" unix-kill) sb!alien:int (pid sb!alien:int) (signal sb!alien:int)) -;;; Send the signal SIGNAL to the process with process id PID. SIGNAL -;;; should be a valid signal number -(defun unix-kill (pid signal) - (real-unix-kill pid signal)) - +;;; Send the signal SIGNAL to the all the process in process group +;;; PGRP. SIGNAL should be a valid signal number #!-sb-fluid (declaim (inline real-unix-killpg)) -(sb!alien:define-alien-routine ("killpg" real-unix-killpg) sb!alien:int +(sb!alien:define-alien-routine ("killpg" unix-killpg) sb!alien:int (pgrp sb!alien:int) (signal sb!alien:int)) -;;; Send the signal SIGNAL to the all the process in process group -;;; PGRP. SIGNAL should be a valid signal number -(defun unix-killpg (pgrp signal) - (real-unix-killpg pgrp signal)) - ;;; Reset the current set of masked signals (those being blocked from ;;; delivery). ;;; @@ -50,10 +44,12 @@ ;;; When inappropriate build options are used, this also prints messages ;;; listing the signals that were masked (sb!alien:define-alien-routine "reset_signal_mask" sb!alien:void) + +(sb!alien:define-alien-routine "block_blockable_signals" sb!alien:void) ;;;; C routines that actually do all the work of establishing signal handlers (sb!alien:define-alien-routine ("install_handler" install-handler) - sb!alien:unsigned-long + sb!alien:unsigned-long (signal sb!alien:int) (handler sb!alien:unsigned-long)) @@ -61,17 +57,18 @@ (defun enable-interrupt (signal handler) (declare (type (or function fixnum (member :default :ignore)) handler)) + (/show0 "enable-interrupt") (without-gcing (let ((result (install-handler signal - (case handler - (:default sig_dfl) - (:ignore sig_ign) - (t - (sb!kernel:get-lisp-obj-address - handler)))))) + (case handler + (:default sig_dfl) + (:ignore sig_ign) + (t + (sb!kernel:get-lisp-obj-address + handler)))))) (cond ((= result sig_dfl) :default) - ((= result sig_ign) :ignore) - (t (the (or function fixnum) (sb!kernel:make-lisp-obj result))))))) + ((= result sig_ign) :ignore) + (t (the (or function fixnum) (sb!kernel:make-lisp-obj result))))))) (defun default-interrupt (signal) (enable-interrupt signal :default)) @@ -88,19 +85,27 @@ ;;; SIGINT in --disable-debugger mode will cleanly terminate the system ;;; (by respecting the *DEBUGGER-HOOK* established in that mode). (defun sigint-%break (format-string &rest format-arguments) + #!+sb-thread + (let ((foreground-thread (sb!thread::foreground-thread))) + (if (eq foreground-thread sb!thread:*current-thread*) + (apply #'%break 'sigint format-string format-arguments) + (sb!thread:interrupt-thread + foreground-thread + (lambda () (apply #'%break 'sigint format-string format-arguments))))) + #!-sb-thread (apply #'%break 'sigint format-string format-arguments)) (eval-when (:compile-toplevel :execute) (sb!xc:defmacro define-signal-handler (name - what - &optional (function 'error)) + what + &optional (function 'error)) `(defun ,name (signal info context) (declare (ignore signal info)) (declare (type system-area-pointer context)) - (/show "in Lisp-level signal handler" (sap-int context)) + (/show "in Lisp-level signal handler" ,(symbol-name name) (sap-int context)) (,function ,(concatenate 'simple-string what " at #X~X") - (with-alien ((context (* os-context-t) context)) - (sap-int (sb!vm:context-pc context))))))) + (with-alien ((context (* os-context-t) context)) + (sap-int (sb!vm:context-pc context))))))) (define-signal-handler sigint-handler "interrupted" sigint-%break) (define-signal-handler sigill-handler "illegal instruction") @@ -121,7 +126,7 @@ (defun sigquit-handler (signal code context) (declare (ignore signal code context)) - (throw 'sb!impl::toplevel-catcher nil)) + (throw 'toplevel-catcher nil)) (defun sb!kernel:signal-cold-init-or-reinit () #!+sb-doc @@ -159,20 +164,20 @@ Establish function as a handler for the Unix signal interrupt which should be a number between 1 and 31 inclusive." (let ((il (gensym)) - (it (gensym))) + (it (gensym))) `(let ((,il NIL)) (unwind-protect - (progn - ,@(do* ((item interrupt-list (cdr item)) - (intr (caar item) (caar item)) - (ifcn (cadar item) (cadar item)) - (forms NIL)) - ((null item) (nreverse forms)) - (when (symbolp intr) - (setq intr (symbol-value intr))) - (push `(push `(,,intr ,(enable-interrupt ,intr ,ifcn)) ,il) - forms)) - ,@body) - (dolist (,it (nreverse ,il)) - (enable-interrupt (car ,it) (cadr ,it))))))) + (progn + ,@(do* ((item interrupt-list (cdr item)) + (intr (caar item) (caar item)) + (ifcn (cadar item) (cadar item)) + (forms NIL)) + ((null item) (nreverse forms)) + (when (symbolp intr) + (setq intr (symbol-value intr))) + (push `(push `(,,intr ,(enable-interrupt ,intr ,ifcn)) ,il) + forms)) + ,@body) + (dolist (,it (nreverse ,il)) + (enable-interrupt (car ,it) (cadr ,it))))))) |#