0.9.18.22:

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

diff --git a/src/code/target-signal.lisp b/src/code/target-signal.lisp
index c6acf9d..ceffe0b 100644 (file)
--- a/src/code/target-signal.lisp
+++ b/src/code/target-signal.lisp
@@ -100,16 +100,7 @@
 (defun sigint-%break (format-string &rest format-arguments)
   (flet ((break-it ()
            (apply #'%break 'sigint format-string format-arguments)))
-    (let ((done-p nil))
-      (loop while (not done-p)
-            do
-            (setq done-p t)
-            ;; what if I type interrupt-thread at the debugger?
-            (handler-case
-                (sb!thread:interrupt-thread (sb!thread::foreground-thread)
-                                            #'break-it)
-              (sb!thread:interrupt-thread-error ()
-                (setq done-p nil)))))))
+    (sb!thread:interrupt-thread (sb!thread::foreground-thread) #'break-it)))
 
 (eval-when (:compile-toplevel :execute)
   (sb!xc:defmacro define-signal-handler (name
@@ -128,29 +119,33 @@
 (define-signal-handler sigint-handler "interrupted" sigint-%break)
 (define-signal-handler sigill-handler "illegal instruction")
 (define-signal-handler sigtrap-handler "breakpoint/trap")
-(define-signal-handler sigiot-handler "SIGIOT")
 #!-linux
 (define-signal-handler sigemt-handler "SIGEMT")
 (define-signal-handler sigbus-handler "bus error")
 (define-signal-handler sigsegv-handler "segmentation violation")
 #!-linux
 (define-signal-handler sigsys-handler "bad argument to a system call")
-(define-signal-handler sigpipe-handler "SIGPIPE")
 
 (defun sigalrm-handler (signal info context)
   (declare (ignore signal info context))
   (declare (type system-area-pointer context))
   (sb!impl::run-expired-timers))
 
-(defun sigquit-handler (signal code context)
+(defun sigterm-handler (signal code context)
   (declare (ignore signal code context))
-  (throw 'toplevel-catcher nil))
+  (sb!thread::terminate-session)
+  (sb!ext:quit))
+
+;; Also known as SIGABRT.
+(defun sigiot-handler (signal code context)
+  (declare (ignore signal code context))
+  (sb!impl::%halt))
 
 (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 sigterm #'sigterm-handler)
   (enable-interrupt sigill #'sigill-handler)
   (enable-interrupt sigtrap #'sigtrap-handler)
   (enable-interrupt sigiot #'sigiot-handler)
@@ -161,13 +156,17 @@
   (enable-interrupt sigsegv #'sigsegv-handler)
   #!-linux
   (enable-interrupt sigsys #'sigsys-handler)
-  (enable-interrupt sigpipe #'sigpipe-handler)
+  (ignore-interrupt sigpipe)
   (enable-interrupt sigalrm #'sigalrm-handler)
   (sb!unix::reset-signal-mask)
   (values))
 \f
 ;;;; etc.
 
+;;; extract si_code from siginfo_t
+(sb!alien:define-alien-routine ("siginfo_code" siginfo-code) sb!alien:int
+  (info system-area-pointer))
+
 ;;; CMU CL comment:
 ;;;   Magically converted by the compiler into a break instruction.
 (defun receive-pending-interrupt ()