X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-signal.lisp;h=09d865389a655dcd27a58acfd99895de2f72104f;hb=aede5ac0bbafc2ec5ef5044a51e47a9e10963d54;hp=cdcae59ec6aa156493746615793bae61058468e4;hpb=ce0a49644dce03ca07008e8073897e4ed7b247df;p=sbcl.git

diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp
index cdcae59..09d8653 100644
--- 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)
@@ -44,10 +54,11 @@
 ;;; 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
+                               sb!alien:unsigned-long
   (signal sb!alien:int)
   (handler sb!alien:unsigned-long))
 
@@ -55,17 +66,22 @@
 
 (defun enable-interrupt (signal handler)
   (declare (type (or function fixnum (member :default :ignore)) handler))
-  (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)))))))
+  (/show0 "enable-interrupt")
+  (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))
@@ -82,19 +98,23 @@
 ;;; 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)
-  (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
-					 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))
-       (,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")
@@ -111,11 +131,11 @@
 (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))
-  (throw 'sb!impl::toplevel-catcher nil))
+  (throw 'toplevel-catcher nil))
 
 (defun sb!kernel:signal-cold-init-or-reinit ()
   #!+sb-doc
@@ -134,6 +154,7 @@
   (enable-interrupt sigsys #'sigsys-handler)
   (enable-interrupt sigpipe #'sigpipe-handler)
   (enable-interrupt sigalrm #'sigalrm-handler)
+  (sb!unix::reset-signal-mask)
   (values))
 
 ;;;; etc.
@@ -153,20 +174,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)))))))
 |#