Changeset 512

Timestamp:

Feb 9, 2004, 8:22:31 AM (21 years ago)

Author:

Gary Byers

Message:

Aargh.

File:

• trunk/ccl/level-1/linux-files.lisp (modified) (3 diffs)

trunk/ccl/level-1/linux-files.lisp

@@ -912 +912 @@
         (append-dll-node request (shared-resource-requestors resource)))
       (wait-on-semaphore (shared-resource-request-signal request))
-      #+debug
-      (assert (eq current (shared-resource-current-owner request)))
+      (assert (eq current (shared-resource-current-owner resource)))
       (when verbose
         (format t "~%~%;;;~%;;; ~a is now owned by ~a~%;;;~%~%"
@@ -928 +927 @@
              (secondary (shared-resource-current-owner r)))
         (unless (setq not-any-owner
-                      (or (eq current secondary)
-                          (and (null secondary)
-                               (eq current primary))))
-          (when secondary
+                      (not (or (eq current secondary)
+                               (and (null secondary)
+                                    (eq current primary)))))
+          (when (eq current secondary)
             (setf (shared-resource-current-owner r) nil)
             (signal-semaphore (shared-resource-primary-owner-notify r))))))
@@ -959 +958 @@
           (when request
             (remove-dll-node request)
+            (setf (shared-resource-current-owner r)
+                  (shared-resource-request-process request))
             (signal-semaphore (shared-resource-request-signal request))))))
     (when request
       (wait-on-semaphore (shared-resource-primary-owner-notify r))
-      (format t "~&;;;~%;;;control of ~a restored to ~a~%;;;~&"
+      (format t "~%;;;~%;;;control of ~a restored to ~a~%;;;~&"
               (shared-resource-name r)
               *current-process*))))