X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=986e7a895e8335ee9f0e28ed7ed7f6f1d8f0237a;hb=a160917364f85b38dc0826a5e3dcef87e3c4c62c;hp=ad91f85c249d8d5c3c0ed670cc3522c2eaca7c18;hpb=b5c69cfe906a31ae57bb0f18c67af9d2eaa1dfef;p=sbcl.git

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index ad91f85..986e7a8 100644
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -19,16 +19,19 @@
     (declare (optimize (safety 0) (speed 3)))
     (sb!vm::locked-symbol-global-value-add ',symbol-name ,delta)))
 
-(defvar *gc-inhibit*) ; initialized in cold init
+;;;; these are initialized in cold init
+
+(defvar *in-without-gcing*)
+(defvar *gc-inhibit*)
 
 ;;; When the dynamic usage increases beyond this amount, the system
 ;;; notes that a garbage collection needs to occur by setting
 ;;; *GC-PENDING* to T. It starts out as NIL meaning nobody has figured
 ;;; out what it should be yet.
-(defvar *gc-pending* nil)
+(defvar *gc-pending*)
 
 #!+sb-thread
-(defvar *stop-for-gc-pending* nil)
+(defvar *stop-for-gc-pending*)
 
 (defmacro without-gcing (&body body)
   #!+sb-doc
@@ -53,26 +56,22 @@ maintained."
               ,@body))
        (if *gc-inhibit*
            (,without-gcing-body)
-           (without-interrupts
-             ;; We need to disable interrupts before disabling GC, so that
-             ;; signal handlers using locks don't accidentally try to grab
-             ;; them with GC inhibited.
-             ;;
-             ;; It would be nice to implement this with just a single UWP, but
-             ;; unfortunately it seems that it cannot be done: the naive
-             ;; solution of binding both *INTERRUPTS-ENABLED* and
-             ;; *GC-INHIBIT*, and checking for both pending GC and interrupts
-             ;; in the cleanup breaks if we have a GC pending, but no
-             ;; interrupts, and we receive an asynch unwind while checking for
-             ;; the pending GC: we unwind before handling the pending GC, and
-             ;; will be left running with further GCs blocked due to the GC
-             ;; pending flag.
+           ;; We need to disable interrupts before disabling GC, so
+           ;; that signal handlers using locks don't accidentally try
+           ;; to grab them with GC inhibited.
+           (let ((*in-without-gcing* t))
              (unwind-protect
-                  (let ((*gc-inhibit* t))
+                  (let* ((*allow-with-interrupts* nil)
+                         (*interrupts-enabled* nil)
+                         (*gc-inhibit* t))
                     (,without-gcing-body))
-               (when (or *gc-pending* #!+sb-thread *stop-for-gc-pending*)
+               ;; This is not racy becuase maybe_defer_handler
+               ;; defers signals if *GC-INHIBIT* is NIL but there
+               ;; is a pending gc or stop-for-gc.
+               (when (or *interrupt-pending*
+                         *gc-pending*
+                         #!+sb-thread *stop-for-gc-pending*)
                  (sb!unix::receive-pending-interrupt))))))))
-
 
 ;;; EOF-OR-LOSE is a useful macro that handles EOF.
 (defmacro eof-or-lose (stream eof-error-p eof-value)
@@ -167,14 +166,19 @@ maintained."
 ;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR.
 (defmacro fast-read-char (&optional (eof-error-p t) (eof-value ()))
   `(cond
-    ((not %frc-buffer%)
-     (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
-    ((= %frc-index% +ansi-stream-in-buffer-length+)
-     (prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value)
-            (setq %frc-index% (ansi-stream-in-index %frc-stream%))))
-    (t
-     (prog1 (aref %frc-buffer% %frc-index%)
-            (incf %frc-index%)))))
+     ((not %frc-buffer%)
+      (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
+     ((= %frc-index% +ansi-stream-in-buffer-length+)
+      (multiple-value-bind (eof-p index-or-value)
+          (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value)
+        (if eof-p
+            index-or-value
+            (progn
+              (setq %frc-index% (1+ index-or-value))
+              (aref %frc-buffer% index-or-value)))))
+     (t
+      (prog1 (aref %frc-buffer% %frc-index%)
+        (incf %frc-index%)))))
 
 ;;;; And these for the fasloader...