Changeset 10483

Timestamp:

Aug 15, 2008, 10:26:29 PM (11 years ago)

Author:

gb

Message:

REGISTER-PACKAGE-REF: use a lock if gethash fails. Ensure that the
package-ref.pkg slot is set if the package exists (see ticket:326).

File:

• trunk/source/level-0/nfasload.lisp (modified) (1 diff)

trunk/source/level-0/nfasload.lisp

@@ -247 +247 @@
 (defvar *package-refs*)
 (setq *package-refs* (make-hash-table :test #'equal))
+(defvar *package-refs-lock*)
+(setq *package-refs-lock* (make-lock))
 
 (defun register-package-ref (name)
-  (or (gethash name *package-refs*)
-      (setf (gethash name *package-refs*) (make-package-ref name))))
+  (let* ((ref
+          (or (gethash name *package-refs*)
+              (with-lock-grabbed (*package-refs-lock*)
+                (or
+                 (gethash name *package-refs*) ; check again
+                 (let* ((r (make-package-ref name)))
+                   (setf (gethash name *package-refs*) r)))))))
+    (unless (package-ref.pkg ref)
+      (setf (package-ref.pkg ref) (find-package name)))
+    ref))
+
 
 (dolist (p %all-packages%)