X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=c4993f4dca53283186b148d9957bfe5e161c95f7;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=aba0098fa1baeb161a8b6b60d0c37555ebdfca59;hpb=8eb6f7d3da3960c827b704e23b5a47008274be7d;p=sbcl.git

diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp
index aba0098..c4993f4 100644
--- a/src/code/sysmacs.lisp
+++ b/src/code/sysmacs.lisp
@@ -10,15 +10,30 @@
 ;;;; files for more information.
 
 (in-package "SB!IMPL")
-
+
+(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)))
+
+;;; When >0, inhibits garbage collection.
+(declaim (type index *gc-inhibit*))
+(defvar *gc-inhibit*) ; initialized in cold init
+
 (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)
@@ -42,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)))
@@ -56,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