0.9.5.44: oops

[sbcl.git] / src / code / target-signal.lisp

diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp
index 0d754e5..09d8653 100644 (file)
--- a/src/code/target-signal.lisp
+++ b/src/code/target-signal.lisp
@@ -11,6 +11,16 @@
 
 (in-package "SB!UNIX")
 
+(defun invoke-interruption (function)
+  (without-interrupts
+    (sb!unix::reset-signal-mask)
+    (funcall function)))
+
+(defmacro in-interruption ((&rest args) &body body)
+  #!+sb-doc
+  "Convenience macro on top of INVOKE-INTERRUPTION."
+  `(invoke-interruption (lambda () ,@body) ,@args))
+
 ;;; These should probably be somewhere, but I don't know where.
 (defconstant sig_dfl 0)
 (defconstant sig_ign 1)
@@ -45,7 +55,6 @@
 ;;; 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)
 \f
 ;;;; C routines that actually do all the work of establishing signal handlers
 (sb!alien:define-alien-routine ("install_handler" install-handler)
@@ -58,17 +67,21 @@
 (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))))))
-     (cond ((= result sig_dfl) :default)
-           ((= result sig_ign) :ignore)
-           (t (the (or function fixnum) (sb!kernel:make-lisp-obj result)))))))
+  (flet ((run-handler (&rest args)
+           (in-interruption ()
+             (apply handler args))))
+    (without-gcing
+      (let ((result (install-handler signal
+                                     (case handler
+                                       (:default sig_dfl)
+                                       (:ignore sig_ign)
+                                       (t
+                                        (sb!kernel:get-lisp-obj-address
+                                         #'run-handler))))))
+        (cond ((= result sig_dfl) :default)
+              ((= result sig_ign) :ignore)
+              (t (the (or function fixnum)
+                   (sb!kernel:make-lisp-obj result))))))))
 
 (defun default-interrupt (signal)
   (enable-interrupt signal :default))
@@ -85,15 +98,9 @@
 ;;; 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))
+  (flet ((break-it ()
+           (apply #'%break 'sigint format-string format-arguments)))
+    (sb!thread:interrupt-thread (sb!thread::foreground-thread) #'break-it)))
 
 (eval-when (:compile-toplevel :execute)
   (sb!xc:defmacro define-signal-handler (name
@@ -102,10 +109,12 @@
     `(defun ,name (signal info context)
        (declare (ignore signal info))
        (declare (type system-area-pointer 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)))))))
+       (/show "in Lisp-level signal handler" ,(symbol-name name)
+              (sap-int context))
+       (with-interrupts
+         (,function ,(concatenate 'simple-string what " at #X~X")
+                    (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")
@@ -122,7 +131,7 @@
 (defun sigalrm-handler (signal info context)
   (declare (ignore signal info context))
   (declare (type system-area-pointer context))
-  (cerror "Continue" 'sb!ext::timeout))
+  (sb!impl::run-expired-timers))
 
 (defun sigquit-handler (signal code context)
   (declare (ignore signal code context))
@@ -145,6 +154,7 @@
   (enable-interrupt sigsys #'sigsys-handler)
   (enable-interrupt sigpipe #'sigpipe-handler)
   (enable-interrupt sigalrm #'sigalrm-handler)
+  (sb!unix::reset-signal-mask)
   (values))
 \f
 ;;;; etc.