0.8.12.7: Merge package locks, AKA "what can go wrong with a 3783 line patch?"

[sbcl.git] / src / code / sysmacs.lisp

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index 1f9b8c8..c4993f4 100644 (file)
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -11,20 +11,17 @@
 
 (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::fast-symbol-global-value-xadd ',symbol-name ,delta)
-    ,symbol-name))
+    (sb!vm::locked-symbol-global-value-add ',symbol-name ,delta)))
+
+;;; When >0, inhibits garbage collection.
+(declaim (type index *gc-inhibit*))
+(defvar *gc-inhibit*) ; initialized in cold init
 
 (defmacro without-gcing (&rest body)
   #!+sb-doc
@@ -35,7 +32,7 @@
       ,@body)
     (atomic-incf/symbol *gc-inhibit* -1)
     (when (and *need-to-collect-garbage* (zerop *gc-inhibit*))
-      (maybe-gc nil))))
+      (sub-gc))))
 
 \f
 ;;; EOF-OR-LOSE is a useful macro that handles EOF.
@@ -60,7 +57,7 @@
                         :datum ,svar
                         :expected-type '(satisfies input-stream-p)
                         :format-control "~S isn't an input stream"
-                        :format-arguments ,(list  svar)))              
+                        :format-arguments (list ,svar)))
                ,svar)))))
 (defmacro out-synonym-of (stream &optional check-type)
   (let ((svar (gensym)))
@@ -74,7 +71,7 @@
                         :datum ,svar
                         :expected-type '(satisfies output-stream-p)
                         :format-control "~S isn't an output stream."
-                        :format-arguments ,(list  svar)))
+                        :format-arguments (list ,svar)))
                ,svar)))))
 
 ;;; WITH-mumble-STREAM calls the function in the given SLOT of the