X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffinal.lisp;h=d6619ed019ae3007b77b5442cf55dad6d2f1e6a0;hb=05d9e55946615d14fa26d276b29072931f9dc5b5;hp=15a45a6b1dfdbc04e9872161795baf5eb389fc4b;hpb=2a71a27c55ad98e36f2886017d45ca2ae986296d;p=sbcl.git

diff --git a/src/code/final.lisp b/src/code/final.lisp
index 15a45a6..d6619ed 100644
--- a/src/code/final.lisp
+++ b/src/code/final.lisp
@@ -13,11 +13,16 @@
 
 (defvar *finalizer-store* nil)
 
-(defvar *finalizer-store-lock* 
+(defvar *finalizer-store-lock*
   (sb!thread:make-mutex :name "Finalizer store lock."))
 
+(defmacro with-finalizer-store-lock (&body body)
+  `(sb!thread::call-with-system-mutex (lambda () ,@body)
+                                      *finalizer-store-lock*
+                                      t))
+
 (defun finalize (object function)
-  #!+sb-doc 
+  #!+sb-doc
   "Arrange for the designated FUNCTION to be called when there
 are no more references to OBJECT, including references in
 FUNCTION itself.
@@ -48,19 +53,18 @@ Examples:
   (defvar *rec* nil)
 
   (defun oops ()
-   (when *rec* 
+   (when *rec*
      (error \"recursive OOPS\"))
    (let ((*rec* t))
      (gc))) ; or just cons enough to cause one
 
-  (progn 
+  (progn
     (finalize \"oops\" #'oops)
     (oops)) ; causes GC and re-entry to #'oops due to the finalizer
             ; -> ERROR, caught, WARNING signalled"
-  (sb!sys:without-gcing
-      (sb!thread:with-mutex (*finalizer-store-lock*)
-	(push (cons (make-weak-pointer object) function)
-	      *finalizer-store*)))
+  (with-finalizer-store-lock
+      (push (cons (make-weak-pointer object) function)
+            *finalizer-store*))
   object)
 
 (defun cancel-finalization (object)
@@ -69,29 +73,27 @@ Examples:
   ;; Check for NIL to avoid deleting finalizers that are waiting to be
   ;; run.
   (when object
-    (sb!sys:without-gcing
-	(sb!thread:with-mutex (*finalizer-store-lock*)
-	  (setf *finalizer-store*
-		(delete object *finalizer-store*
-			:key (lambda (pair) 
-			       (weak-pointer-value (car pair)))))))
+    (with-finalizer-store-lock
+        (setf *finalizer-store*
+              (delete object *finalizer-store*
+                      :key (lambda (pair)
+                             (weak-pointer-value (car pair))))))
     object))
 
 (defun run-pending-finalizers ()
   (let (pending)
-    (sb!sys:without-gcing
-	(sb!thread:with-mutex (*finalizer-store-lock*)
-	  (setf *finalizer-store*
-		(delete-if  (lambda (pair)
-			      (when (null (weak-pointer-value (car pair)))
-				(push (cdr pair) pending)
-				t))
-			    *finalizer-store*))))
+    (with-finalizer-store-lock
+        (setf *finalizer-store*
+              (delete-if  (lambda (pair)
+                            (when (null (weak-pointer-value (car pair)))
+                              (push (cdr pair) pending)
+                              t))
+                          *finalizer-store*)))
     ;; We want to run the finalizer bodies outside the lock in case
     ;; finalization of X causes finalization to be added for Y.
     (dolist (fun pending)
       (handler-case
-	  (funcall fun)
-	(error (c)
-	  (warn "Error calling finalizer ~S:~%  ~S" fun c)))))
+          (funcall fun)
+        (error (c)
+          (warn "Error calling finalizer ~S:~%  ~S" fun c)))))
   nil)