X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-signal.lisp;h=8c0f4868c5ddc85e41824db3548330a1fd114d44;hb=77bf768d096845986af71ca5055c94c4abd626ed;hp=c3b664437c8aadef50340150cd55a911464f86a2;hpb=23124951022f995aace9e7f17e650cd23b83c591;p=sbcl.git diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp index c3b6644..8c0f486 100644 --- a/src/code/target-signal.lisp +++ b/src/code/target-signal.lisp @@ -11,19 +11,43 @@ (in-package "SB!UNIX") +(defmacro with-interrupt-bindings (&body body) + (with-unique-names (empty) + `(let* + ;; KLUDGE: Whatever is on the PCL stacks before the interrupt + ;; handler runs doesn't really matter, since we're not on the + ;; same call stack, really -- and if we don't bind these (esp. + ;; the cache one) we can get a bogus metacircle if an interrupt + ;; handler calls a GF that was being computed when the interrupt + ;; hit. + ((sb!pcl::*cache-miss-values-stack* nil) + (sb!pcl::*dfun-miss-gfs-on-stack* nil) + ;; Unless we do this, ADJUST-ARRAY and SORT would need to + ;; disable interrupts. + (,empty (vector)) + (sb!impl::*zap-array-data-temp* ,empty) + (sb!impl::*merge-sort-temp-vector* ,empty)) + ,@body))) + (defun invoke-interruption (function) (without-interrupts - (sb!unix::reset-signal-mask) - (funcall function))) - -(defmacro in-interruption ((&rest args) &body body) + (with-interrupt-bindings + ;; Reset signal mask: the C-side handler has blocked all + ;; deferrable interrupts before arranging return to lisp. This is + ;; safe because we can't get a pending interrupt before we unblock + ;; signals. + ;; + ;; FIXME: Should we not reset the _entire_ mask, but just + ;; restore it to the state before we got the interrupt? + (reset-signal-mask) + (let ((sb!debug:*stack-top-hint* (nth-value 1 (sb!kernel:find-interrupted-name-and-frame)))) + (allow-with-interrupts (funcall function)))))) + +(defmacro in-interruption ((&key) &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) + `(dx-flet ((interruption () ,@body)) + (invoke-interruption #'interruption))) ;;;; system calls that deal with signals @@ -68,18 +92,19 @@ (declare (type (or function fixnum (member :default :ignore)) handler)) (/show0 "enable-interrupt") (flet ((run-handler (&rest args) + (declare (truly-dynamic-extent args)) (in-interruption () (apply handler args)))) (without-gcing (let ((result (install-handler signal (case handler - (:default sig_dfl) - (:ignore sig_ign) + (:default sig-dfl) + (:ignore sig-ign) (t (sb!kernel:get-lisp-obj-address #'run-handler)))))) - (cond ((= result sig_dfl) :default) - ((= result sig_ign) :ignore) + (cond ((= result sig-dfl) :default) + ((= result sig-ign) :ignore) (t (the (or function fixnum) (sb!kernel:make-lisp-obj result)))))))) @@ -97,15 +122,8 @@ ;;; *DEBUGGER-HOOK*, but we want SIGINT's BREAK to respect it, so that ;;; 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) - (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)) + (sb!xc:defmacro define-signal-handler (name what &optional (function 'error)) `(defun ,name (signal info context) (declare (ignore signal info)) (declare (type system-area-pointer context)) @@ -116,7 +134,6 @@ (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") #!-linux (define-signal-handler sigemt-handler "SIGEMT") @@ -125,6 +142,18 @@ #!-linux (define-signal-handler sigsys-handler "bad argument to a system call") +(defun sigint-handler (signal info context) + (declare (ignore signal info)) + (declare (type system-area-pointer context)) + (/show "in Lisp-level SIGINT handler" (sap-int context)) + (flet ((interrupt-it () + (with-alien ((context (* os-context-t) context)) + (%break 'sigint 'interactive-interrupt + :context context + :address (sap-int (sb!vm:context-pc context)))))) + (sb!thread:interrupt-thread (sb!thread::foreground-thread) + #'interrupt-it))) + (defun sigalrm-handler (signal info context) (declare (ignore signal info context)) (declare (type system-area-pointer context)) @@ -169,31 +198,3 @@ ;;; Magically converted by the compiler into a break instruction. (defun receive-pending-interrupt () (receive-pending-interrupt)) - -;;; stale code which I'm insufficiently motivated to test -- WHN 19990714 -#| -;;;; WITH-ENABLED-INTERRUPTS - -(defmacro with-enabled-interrupts (interrupt-list &body body) - #!+sb-doc - "With-enabled-interrupts ({(interrupt function)}*) {form}* - 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))) - `(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))))))) -|#