X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=dc1358edc7c5f63a9703752e84bab162721acc32;hb=860543cc7ba0266e41e1d41ac9b6a208f3795f1a;hp=81acb91bd0686dcbb26e4921987e6e8ed1c6a73a;hpb=f61bddabbb69f1347b81b8ab76e709635a7a0739;p=sbcl.git

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index 81acb91..dc1358e 100644
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -10,15 +10,32 @@
 ;;;; files for more information.
 
 (in-package "SB!IMPL")
-
+
+;;; FIXME Not the most sensible way to do this: we could just use
+;;; LOCK ADD, given that we don't need the old version.  This will
+;;; do until we get around to writing new VOPs
+;;; FIXME in fact we're not SMP-safe without LOCK anyway, but
+;;; this will do us for UP systems
+
+(defmacro atomic-incf/symbol (symbol-name &optional (delta 1))
+  #!-sb-thread
+  `(incf ,symbol-name ,delta)
+  #!+sb-thread
+  `(locally
+    (declare (optimize (safety 0) (speed 3)))
+    (sb!vm::locked-symbol-global-value-add ',symbol-name ,delta)))
+
 (defmacro without-gcing (&rest body)
   #!+sb-doc
   "Executes the forms in the body without doing a garbage collection."
   `(unwind-protect
-       (let ((*gc-inhibit* t))
-	 ,@body)
-     (when (and *need-to-collect-garbage* (not *gc-inhibit*))
-       (maybe-gc nil))))
+    (progn
+      (atomic-incf/symbol *gc-inhibit*)
+      ,@body)
+    (atomic-incf/symbol *gc-inhibit* -1)
+    (when (and *need-to-collect-garbage* (zerop *gc-inhibit*))
+      (sub-gc))))
+
 
 ;;; EOF-OR-LOSE is a useful macro that handles EOF.
 (defmacro eof-or-lose (stream eof-error-p eof-value)
@@ -60,12 +77,12 @@
 		,svar)))))
 
 ;;; WITH-mumble-STREAM calls the function in the given SLOT of the
-;;; STREAM with the ARGS for LISP-STREAMs, or the FUNCTION with the
+;;; STREAM with the ARGS for ANSI-STREAMs, or the FUNCTION with the
 ;;; ARGS for FUNDAMENTAL-STREAMs.
 (defmacro with-in-stream (stream (slot &rest args) &optional stream-dispatch)
   `(let ((stream (in-synonym-of ,stream)))
     ,(if stream-dispatch
-	 `(if (lisp-stream-p stream)
+	 `(if (ansi-stream-p stream)
 	      (funcall (,slot stream) stream ,@args)
 	      ,@(when stream-dispatch
 		  `(,(destructuring-bind (function &rest args) stream-dispatch
@@ -75,7 +92,7 @@
 (defmacro with-out-stream (stream (slot &rest args) &optional stream-dispatch)
   `(let ((stream (out-synonym-of ,stream)))
     ,(if stream-dispatch
-	 `(if (lisp-stream-p stream)
+	 `(if (ansi-stream-p stream)
 	      (funcall (,slot stream) stream ,@args)
 	      ,@(when stream-dispatch
 		  `(,(destructuring-bind (function &rest args) stream-dispatch
@@ -86,20 +103,20 @@
 
 ;;; This macro sets up some local vars for use by the
 ;;; FAST-READ-CHAR macro within the enclosed lexical scope. The stream
-;;; is assumed to be a LISP-STREAM.
+;;; is assumed to be a ANSI-STREAM.
 (defmacro prepare-for-fast-read-char (stream &body forms)
   `(let* ((%frc-stream% ,stream)
-	  (%frc-method% (lisp-stream-in %frc-stream%))
-	  (%frc-buffer% (lisp-stream-in-buffer %frc-stream%))
-	  (%frc-index% (lisp-stream-in-index %frc-stream%)))
+	  (%frc-method% (ansi-stream-in %frc-stream%))
+	  (%frc-buffer% (ansi-stream-in-buffer %frc-stream%))
+	  (%frc-index% (ansi-stream-in-index %frc-stream%)))
      (declare (type index %frc-index%)
-	      (type lisp-stream %frc-stream%))
+	      (type ansi-stream %frc-stream%))
      ,@forms))
 
 ;;; This macro must be called after one is done with FAST-READ-CHAR
-;;; inside its scope to decache the lisp-stream-in-index.
+;;; inside its scope to decache the ANSI-STREAM-IN-INDEX.
 (defmacro done-with-fast-read-char ()
-  `(setf (lisp-stream-in-index %frc-stream%) %frc-index%))
+  `(setf (ansi-stream-in-index %frc-stream%) %frc-index%))
 
 ;;; a macro with the same calling convention as READ-CHAR, to be used
 ;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR
@@ -107,9 +124,9 @@
   `(cond
     ((not %frc-buffer%)
      (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
-    ((= %frc-index% +in-buffer-length+)
+    ((= %frc-index% +ansi-stream-in-buffer-length+)
      (prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value)
-	    (setq %frc-index% (lisp-stream-in-index %frc-stream%))))
+	    (setq %frc-index% (ansi-stream-in-index %frc-stream%))))
     (t
      (prog1 (code-char (aref %frc-buffer% %frc-index%))
 	    (incf %frc-index%)))))
@@ -117,7 +134,7 @@
 ;;;; And these for the fasloader...
 
 ;;; Just like PREPARE-FOR-FAST-READ-CHAR except that we get the BIN
-;;; method. The stream is assumed to be a LISP-STREAM.
+;;; method. The stream is assumed to be a ANSI-STREAM.
 ;;;
 ;;; KLUDGE: It seems weird to have to remember to explicitly call
 ;;; DONE-WITH-FAST-READ-BYTE at the end of this, given that we're
@@ -128,11 +145,11 @@
 ;;; for the FAST-READ-CHAR stuff) -- WHN 19990825
 (defmacro prepare-for-fast-read-byte (stream &body forms)
   `(let* ((%frc-stream% ,stream)
-	  (%frc-method% (lisp-stream-bin %frc-stream%))
-	  (%frc-buffer% (lisp-stream-in-buffer %frc-stream%))
-	  (%frc-index% (lisp-stream-in-index %frc-stream%)))
+	  (%frc-method% (ansi-stream-bin %frc-stream%))
+	  (%frc-buffer% (ansi-stream-in-buffer %frc-stream%))
+	  (%frc-index% (ansi-stream-in-index %frc-stream%)))
      (declare (type index %frc-index%)
-	      (type lisp-stream %frc-stream%))
+	      (type ansi-stream %frc-stream%))
      ,@forms))
 
 ;;; Similar to fast-read-char, but we use a different refill routine & don't
@@ -145,9 +162,9 @@
     (cond
      ((not %frc-buffer%)
       (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
-     ((= %frc-index% +in-buffer-length+)
+     ((= %frc-index% +ansi-stream-in-buffer-length+)
       (prog1 (fast-read-byte-refill %frc-stream% ,eof-error-p ,eof-value)
-	(setq %frc-index% (lisp-stream-in-index %frc-stream%))))
+	(setq %frc-index% (ansi-stream-in-index %frc-stream%))))
      (t
       (prog1 (aref %frc-buffer% %frc-index%)
 	(incf %frc-index%))))))