0.8.0.24:

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

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index aba0098..dc1358e 100644 (file)
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -10,15 +10,32 @@
 ;;;; files for more information.
 
 (in-package "SB!IMPL")
-\f
+
+;;; 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))))
+
 \f
 ;;; EOF-OR-LOSE is a useful macro that handles EOF.
 (defmacro eof-or-lose (stream eof-error-p eof-value)