X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-signal.lisp;h=5a43e1761afcf93e628669a39f4e25776813fb5d;hb=791e9d15abba835457b308121668a0ce75386a03;hp=87f42d1bf544416bf1f29f328fc3a0dae6df448f;hpb=05525d3a5906d7a89fcb689c26177732493c40ce;p=sbcl.git

diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp
index 87f42d1..5a43e17 100644
--- a/src/code/target-signal.lisp
+++ b/src/code/target-signal.lisp
@@ -17,53 +17,47 @@
 
 ;;;; 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 or a keyword of the standard UNIX
-;;; signal name.
-(defun unix-kill (pid signal)
-  (real-unix-kill pid (unix-signal-number 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 or a keyword of the
-;;; standard UNIX signal name.
-(defun unix-killpg (pgrp signal)
-  (real-unix-killpg pgrp (unix-signal-number signal)))
-
-;;; Set the current set of masked signals (those being blocked from
+;;; Reset the current set of masked signals (those being blocked from
 ;;; delivery).
 ;;;
-;;; (Note: CMU CL had a SIGMASK operator to create masks, but since
-;;; SBCL only uses 0, we no longer support it. If you need it, you
-;;; can pull it out of the CMU CL sources, or the old SBCL sources;
-;;; but you might also consider doing things the SBCL way and moving
-;;; this kind of C-level work down to C wrapper functions.)
-#!-sunos
-(sb!alien:define-alien-routine ("sigsetmask" unix-sigsetmask)
-			       sb!alien:unsigned-long
-  (mask sb!alien:unsigned-long))
+;;; (Note: CMU CL had a more general SIGSETMASK call and a SIGMASK
+;;; operator to create masks, but since we only ever reset to 0, we no
+;;; longer support it. If you need it, you can pull it out of the CMU
+;;; CL sources, or the old SBCL sources; but you might also consider
+;;; doing things the SBCL way and moving this kind of C-level work
+;;; down to C wrapper functions.)
+
+;;; 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)
 
 ;;;; 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
   (signal sb!alien:int)
   (handler sb!alien:unsigned-long))
-
+
 ;;;; interface to enabling and disabling signal handlers
 
-(defun enable-interrupt (signal-designator handler)
+(defun enable-interrupt (signal handler)
   (declare (type (or function fixnum (member :default :ignore)) handler))
+  (/show0 "enable-interrupt")
   (without-gcing
-   (let ((result (install-handler (unix-signal-number signal-designator)
+   (let ((result (install-handler signal
 				  (case handler
 				    (:default sig_dfl)
 				    (:ignore sig_ign)
@@ -98,7 +92,7 @@
     `(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)))))))
@@ -127,20 +121,20 @@
 (defun sb!kernel:signal-cold-init-or-reinit ()
   #!+sb-doc
   "Enable all the default signals that Lisp knows how to deal with."
-  (enable-interrupt :sigint #'sigint-handler)
-  (enable-interrupt :sigquit #'sigquit-handler)
-  (enable-interrupt :sigill #'sigill-handler)
-  (enable-interrupt :sigtrap #'sigtrap-handler)
-  (enable-interrupt :sigiot #'sigiot-handler)
+  (enable-interrupt sigint #'sigint-handler)
+  (enable-interrupt sigquit #'sigquit-handler)
+  (enable-interrupt sigill #'sigill-handler)
+  (enable-interrupt sigtrap #'sigtrap-handler)
+  (enable-interrupt sigiot #'sigiot-handler)
   #!-linux
-  (enable-interrupt :sigemt #'sigemt-handler)
-  (enable-interrupt :sigfpe #'sb!vm:sigfpe-handler)
-  (enable-interrupt :sigbus #'sigbus-handler)
-  (enable-interrupt :sigsegv #'sigsegv-handler)
+  (enable-interrupt sigemt #'sigemt-handler)
+  (enable-interrupt sigfpe #'sb!vm:sigfpe-handler)
+  (enable-interrupt sigbus #'sigbus-handler)
+  (enable-interrupt sigsegv #'sigsegv-handler)
   #!-linux
-  (enable-interrupt :sigsys #'sigsys-handler)
-  (enable-interrupt :sigpipe #'sigpipe-handler)
-  (enable-interrupt :sigalrm #'sigalrm-handler)
+  (enable-interrupt sigsys #'sigsys-handler)
+  (enable-interrupt sigpipe #'sigpipe-handler)
+  (enable-interrupt sigalrm #'sigalrm-handler)
   (values))
 
 ;;;; etc.