Changeset 7865

Timestamp:

Dec 10, 2007, 4:53:43 AM (17 years ago)

Author:

Gary Byers

Message:

GETHASH locks hash-table for reading, promotes to write-access only if
rehashing needed.

File:

• branches/working-0711/ccl/level-0/l0-hash.lisp (modified) (2 diffs)

branches/working-0711/ccl/level-0/l0-hash.lisp

@@ -701 +701 @@
     (with-lock-context
       (without-interrupts
-       (setq readonly (eq #+notyet (read-lock-hash-table hash)
-                          #-notyet (if (nhash.read-only hash)
-                                     :readonly
-                                     (write-lock-hash-table hash))
-                          :readonly))
+       (setq readonly (eq (read-lock-hash-table hash) :readonly))
        (let* ((vector (nhash.vector hash)))
          (if (and (eq key (nhash.vector.cache-key vector))
@@ -729 +725 @@
                       (return))
                      ((%needs-rehashing-p hash)
+                      (%lock-gc-lock)
                       (setq gc-locked t)
-                      (%lock-gc-lock)
-                      (%rehash hash))
+                      (unless readonly
+                        (let* ((lock (nhash.exclusion-lock hash)))
+                          (when lock (%promote-rwlock lock))))
+                      (when (%needs-rehashing-p hash)
+                        (%rehash hash)))
                      (t (return)))))))
        (when gc-locked (%unlock-gc-lock))