Changeset 4932

Timestamp:

Jul 29, 2006, 6:39:03 AM (18 years ago)

Author:

Gary Byers

Message:

ALLOCATE-RESOURCE, FREE-RESOURCE: use lock.
TODO: evaluate whether resources are worthwhile; used for string-output-stream
allocation and DELETE-DUPLICATES.

File:

• trunk/ccl/level-1/l1-aprims.lisp (modified) (1 diff)

trunk/ccl/level-1/l1-aprims.lisp

@@ -1211 +1211 @@
 (defun allocate-resource (resource)
   (setq resource (require-type resource 'resource))
-  (let ((pool (resource.pool resource))
-        res)
-    (without-interrupts
-     (let ((data (pool.data pool)))
-       (when data
-         (setf res (car data)
-               (pool.data pool) (cdr (the cons data)))
-         (free-cons data))))
-    (if res
-      (let ((initializer (resource.initializer resource)))
-        (when initializer
-          (funcall initializer res)))
-      (setq res (funcall (resource.constructor resource))))
-    res))
+  (with-lock-grabbed ((resource.lock resource))
+    (let ((pool (resource.pool resource))
+          res)
+      (let ((data (pool.data pool)))
+        (when data
+          (setf res (car data)
+                (pool.data pool) (cdr (the cons data)))
+          (free-cons data)))
+      (if res
+        (let ((initializer (resource.initializer resource)))
+          (when initializer
+            (funcall initializer res)))
+        (setq res (funcall (resource.constructor resource))))
+      res)))
 
 (defun free-resource (resource instance)
   (setq resource (require-type resource 'resource))
-  (let ((pool (resource.pool resource))
-        (destructor (resource.destructor resource)))
-    (when destructor
-      (funcall destructor instance))
-    (without-interrupts
-     (setf (pool.data pool)
-           (cheap-cons instance (pool.data pool)))))
+  (with-lock-grabbed ((resource.lock resource))
+    (let ((pool (resource.pool resource))
+          (destructor (resource.destructor resource)))
+      (when destructor
+        (funcall destructor instance))
+      (setf (pool.data pool)
+            (cheap-cons instance (pool.data pool)))))
   resource)