Changeset 14547 for release/1.6/source

Timestamp:

Jan 3, 2011, 3:56:53 PM (10 years ago)

Author:

wws

Message:

Merge r14541 from trunk (limit reader-signal/writer-signal values for futexes in rwlocks)

File:

• release/1.6/source/level-0/l0-misc.lisp (modified) (5 diffs, 1 prop)

release/1.6/source/level-0/l0-misc.lisp

@@ -890 +890 @@
                ;; That wasn't so bad, was it ?  We have the spinlock now.
                (setf (%get-signed-natural ptr target::rwlock.state) 1)
+               (setf (%get-signed-long write-signal) -1)
                (%unlock-futex ptr)
                (%set-object ptr target::rwlock.writer tcr)
@@ -896 +897 @@
                t)
            (incf (%get-natural ptr target::rwlock.blocked-writers))
-           (let* ((waitval (%get-natural write-signal 0)))
+           (let* ((waitval -1))
              (%unlock-futex ptr)
              (with-process-whostate ((rwlock-write-whostate lock))
@@ -964 +965 @@
                (setf (%get-signed-natural ptr target::rwlock.state)
                      (the fixnum (1- state)))
+               (setf (%get-signed-long reader-signal) -1) ; can happen multiple times, but that's harmless
                (%unlock-futex ptr)
                (if flag
@@ -970 +972 @@
            (declare (fixnum state))
            (incf (%get-natural ptr target::rwlock.blocked-readers))
-           (let* ((waitval (%get-natural reader-signal 0)))
+           (let* ((waitval -1))
              (%unlock-futex ptr)
              (let* ((*interrupt-level* level))
@@ -1067 +1069 @@
              (if (> nreaders 0)
                (setq signal reader-signal wakeup #$INT_MAX)))))
-       (when signal (incf (%get-signed-natural signal 0)))
+       (when signal (setf (%get-signed-long signal) 0))
        (%unlock-futex ptr)
        (when signal (futex-wake signal wakeup))