From: Nikodemus S. <de...@us...> - 2011-11-10 17:39:25
|
The branch "master" has been updated in SBCL: via 4255b37e50876702d2563f3418a44a3f5bf8a2e8 (commit) from 6a503c1fa1831c2045f278b8d0523296e09c9cee (commit) - Log ----------------------------------------------------------------- commit 4255b37e50876702d2563f3418a44a3f5bf8a2e8 Author: Nikodemus Siivola <nik...@ra...> Date: Thu Nov 10 19:09:37 2011 +0200 fix unthreaded build CONDITION-WAIT on threadless builds now reads TIMEOUT. Stray MUTEX/LOCK naming confusion. #+sb-thread on more mailbox test. #!+sb-thread %WAIT-FOR-MUTEX for cleanliness. --- contrib/sb-concurrency/tests/test-mailbox.lisp | 1 + src/code/target-thread.lisp | 4 +++- src/code/thread.lisp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contrib/sb-concurrency/tests/test-mailbox.lisp b/contrib/sb-concurrency/tests/test-mailbox.lisp index db4b221..e6cee14 100644 --- a/contrib/sb-concurrency/tests/test-mailbox.lisp +++ b/contrib/sb-concurrency/tests/test-mailbox.lisp @@ -38,6 +38,7 @@ (3 nil (#\1 #\2 #\3) nil) (0 t nil t)) +#+sb-thread (deftest mailbox-timeouts (let* ((mbox (make-mailbox)) (writers (loop for i from 1 upto 20 diff --git a/src/code/target-thread.lisp b/src/code/target-thread.lisp index 0d0ccb9..553dc67 100644 --- a/src/code/target-thread.lisp +++ b/src/code/target-thread.lisp @@ -493,6 +493,7 @@ HOLDING-MUTEX-P." ;; Spin. (go :retry)))) +#!+sb-thread (defun %wait-for-mutex (mutex self timeout to-sec to-usec stop-sec stop-usec deadlinep) (with-deadlocks (self mutex timeout) (with-interrupts (check-deadlock)) @@ -732,7 +733,8 @@ around the call, checking the the associated data: (push data *data*) (condition-notify *queue*))) " - #!-sb-thread (declare (ignore queue timeout)) + #!-sb-thread + (declare (ignore queue)) (assert mutex) #!-sb-thread (wait-for nil :timeout timeout) ; Yeah... diff --git a/src/code/thread.lisp b/src/code/thread.lisp index c471fc9..6e42788 100644 --- a/src/code/thread.lisp +++ b/src/code/thread.lisp @@ -207,7 +207,7 @@ provided the default value is used for the mutex." (funcall function))) (defun call-with-recursive-system-lock/without-gcing (function mutex) - (declare (function function) (ignore lock)) + (declare (function function) (ignore mutex)) (without-gcing (funcall function)))) ----------------------------------------------------------------------- hooks/post-receive -- SBCL |
From: Nikodemus S. <de...@us...> - 2012-09-16 13:35:14
|
The branch "master" has been updated in SBCL: via 7c9bae1be633be46bc454bd34f55263b24aafca8 (commit) from 508bdb85a65b4530e9d8c4b978539393f64cb234 (commit) - Log ----------------------------------------------------------------- commit 7c9bae1be633be46bc454bd34f55263b24aafca8 Author: Nikodemus Siivola <nik...@ra...> Date: Sun Sep 16 16:07:01 2012 +0300 fix unthreaded build --- src/code/thread.lisp | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/code/thread.lisp b/src/code/thread.lisp index f73c9bd..d796f60 100644 --- a/src/code/thread.lisp +++ b/src/code/thread.lisp @@ -228,7 +228,7 @@ held mutex, WITH-RECURSIVE-LOCK allows recursive lock attempts to succeed." #!-sb-thread (progn (defun call-with-mutex (function mutex value waitp timeout) - (declare (ignore mutex value waitp timeout) + (declare (ignore mutex waitp timeout) (function function)) (unless (or (null value) (eq *current-thread* value)) (error "~S called with non-nil :VALUE that isn't the current thread." @@ -236,7 +236,8 @@ held mutex, WITH-RECURSIVE-LOCK allows recursive lock attempts to succeed." (funcall function)) (defun call-with-recursive-lock (function mutex waitp timeout) - (declare (ignore mutex) (function function waitp timeout)) + (declare (ignore mutex waitp timeout) + (function function)) (funcall function)) (defun call-with-recursive-system-lock (function lock) ----------------------------------------------------------------------- hooks/post-receive -- SBCL |