Changeset 5408

Timestamp:

Oct 23, 2006, 7:26:25 AM (18 years ago)

Author:

Gary Byers

Message:

Some/most/all of the WITH-IOBLOCK-OUTPUT-LOCKED macros were checking
for the presence of an input lock ...

File:

• trunk/ccl/lib/macros.lisp (modified) (3 diffs)

trunk/ccl/lib/macros.lisp

@@ -3229 +3229 @@
                                   (ioblock-inbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed ((locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock)))
+        (with-lock-grabbed (,lock)
           ,@body)
         (progn
@@ -3239 +3238 @@
   (let* ((lock (gensym)))
     `(let* ((,lock (locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock))))
+                                  (ioblock-outbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed ((locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-outbuf-lock ,ioblock)))
+        (with-lock-grabbed (,lock)
           ,@body)
         (progn
@@ -3253 +3251 @@
   (let* ((lock (gensym)))
     `(let* ((,lock (locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock))))
+                                  (ioblock-outbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed-maybe ((locally (declare (optimize (speed 3) (safety 0)))
-                                            (ioblock-outbuf-lock ,ioblock)))
+        (with-lock-grabbed-maybe (,lock)
           ,@body)
         (progn