X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fthread.lisp;h=85eb1c82dadf4a8df6f7551a9756a7ca6b2ddab0;hb=23e31980c78d174ef9cb775bf28f970890327fea;hp=1d751ac667a9243affd2cbdc524733bbf7f08a4f;hpb=513aec1c69b8ad9a7d90a46013352725fe0b0a48;p=sbcl.git diff --git a/src/code/thread.lisp b/src/code/thread.lisp index 1d751ac..85eb1c8 100644 --- a/src/code/thread.lisp +++ b/src/code/thread.lisp @@ -11,21 +11,47 @@ (in-package "SB!THREAD") +(def!type thread-name () + 'simple-string) + +(def!struct (thread (:constructor %make-thread)) + #!+sb-doc + "Thread type. Do not rely on threads being structs as it may change +in future versions." + (name nil :type (or thread-name null)) + (%alive-p nil :type boolean) + (os-thread nil :type (or integer null)) + (interruptions nil :type list) + (result nil :type list) + (interruptions-lock + (make-mutex :name "thread interruptions lock") + :type mutex) + (result-lock + (make-mutex :name "thread result lock") + :type mutex) + waiting-for) + (def!struct mutex #!+sb-doc "Mutex type." - (name nil :type (or null simple-string)) + (name nil :type (or null thread-name)) (%owner nil :type (or null thread)) #!+(and (not sb-lutex) sb-thread) - (state 0 :type fixnum) + (state 0 :type fixnum) #!+(and sb-lutex sb-thread) (lutex (make-lutex))) -;;; FIXME: We probably want to rename the accessor MUTEX-OWNER. (defun mutex-value (mutex) - "Current owner of the mutex, NIL if the mutex is free." + "Current owner of the mutex, NIL if the mutex is free. May return a +stale value, use MUTEX-OWNER instead." (mutex-%owner mutex)) +(defun holding-mutex-p (mutex) + "Test whether the current thread is holding MUTEX." + ;; This is about the only use for which a stale value of owner is + ;; sufficient. + (eq sb!thread:*current-thread* (mutex-%owner mutex))) + (defsetf mutex-value set-mutex-value) (declaim (inline set-mutex-value)) @@ -42,15 +68,15 @@ (def!struct spinlock #!+sb-doc "Spinlock type." - (name nil :type (or null simple-string)) + (name nil :type (or null thread-name)) (value nil)) (sb!xc:defmacro with-mutex ((mutex &key (value '*current-thread*) (wait-p t)) &body body) #!+sb-doc - "Acquire MUTEX for the dynamic scope of BODY, setting it to -NEW-VALUE or some suitable default value if NIL. If WAIT-P is non-NIL -and the mutex is in use, sleep until it is available" + "Acquire MUTEX for the dynamic scope of BODY, setting it to VALUE or +some suitable default value if NIL. If WAIT-P is non-NIL and the mutex +is in use, sleep until it is available" `(dx-flet ((with-mutex-thunk () ,@body)) (call-with-mutex #'with-mutex-thunk @@ -58,12 +84,24 @@ and the mutex is in use, sleep until it is available" ,value ,wait-p))) -(sb!xc:defmacro with-system-mutex ((mutex &key without-gcing) &body body) +(sb!xc:defmacro with-system-mutex ((mutex + &key without-gcing allow-with-interrupts) + &body body) `(dx-flet ((with-system-mutex-thunk () ,@body)) - (call-with-system-mutex - #'with-system-mutex-thunk - ,mutex - ,without-gcing))) + (,(cond (without-gcing + 'call-with-system-mutex/without-gcing) + (allow-with-interrupts + 'call-with-system-mutex/allow-with-interrupts) + (t + 'call-with-system-mutex)) + #'with-system-mutex-thunk + ,mutex))) + +(sb!xc:defmacro with-system-spinlock ((spinlock &key) &body body) + `(dx-flet ((with-system-spinlock-thunk () ,@body)) + (call-with-system-spinlock + #'with-system-spinlock-thunk + ,spinlock))) (sb!xc:defmacro with-recursive-lock ((mutex) &body body) #!+sb-doc @@ -82,13 +120,16 @@ provided the default value is used for the mutex." #'with-recursive-spinlock-thunk ,spinlock))) -(sb!xc:defmacro with-recursive-system-spinlock ((spinlock &key without-gcing) +(sb!xc:defmacro with-recursive-system-spinlock ((spinlock + &key without-gcing) &body body) `(dx-flet ((with-recursive-system-spinlock-thunk () ,@body)) - (call-with-recursive-system-spinlock - #'with-recursive-system-spinlock-thunk - ,spinlock - ,without-gcing))) + (,(cond (without-gcing + 'call-with-recursive-system-spinlock/without-gcing) + (t + 'call-with-recursive-system-spinlock)) + #'with-recursive-system-spinlock-thunk + ,spinlock))) (sb!xc:defmacro with-spinlock ((spinlock) &body body) `(dx-flet ((with-spinlock-thunk () ,@body)) @@ -96,39 +137,47 @@ provided the default value is used for the mutex." #'with-spinlock-thunk ,spinlock))) -;;; KLUDGE: this separate implementation for (NOT SB-THREAD) is not -;;; strictly necessary; GET-MUTEX and RELEASE-MUTEX are implemented. -;;; However, there would be a (possibly slight) performance hit in -;;; using them. +(macrolet ((def (name &optional variant) + `(defun ,(if variant (symbolicate name "/" variant) name) + (function mutex) + (declare (function function)) + (flet ((%call-with-system-mutex () + (dx-let (got-it) + (unwind-protect + (when (setf got-it (get-mutex mutex)) + (funcall function)) + (when got-it + (release-mutex mutex)))))) + (declare (inline %call-with-system-mutex)) + ,(ecase variant + (:without-gcing + `(without-gcing (%call-with-system-mutex))) + (:allow-with-interrupts + `(without-interrupts + (allow-with-interrupts (%call-with-system-mutex)))) + ((nil) + `(without-interrupts (%call-with-system-mutex)))))))) + (def call-with-system-mutex) + (def call-with-system-mutex :without-gcing) + (def call-with-system-mutex :allow-with-interrupts)) + #!-sb-thread (progn - (defun call-with-system-mutex (function mutex &optional without-gcing-p) - (declare (ignore mutex) - (function function)) - (if without-gcing-p - (without-gcing - (funcall function)) - (without-interrupts - (allow-with-interrupts (funcall function))))) - - (defun call-with-system-spinlock (function spinlock &optional without-gcing-p) - (declare (ignore spinlock) - (function function)) - (if without-gcing-p - (without-gcing - (funcall function)) - (without-interrupts - (allow-with-interrupts (funcall function))))) - - (defun call-with-recursive-system-spinlock (function lock - &optional without-gcing-p) - (declare (ignore lock) - (function function)) - (if without-gcing-p - (without-gcing - (funcall function)) - (without-interrupts - (allow-with-interrupts (funcall function))))) + (macrolet ((def (name &optional variant) + `(defun ,(if variant (symbolicate name "/" variant) name) + (function lock) + (declare (ignore lock) (function function)) + ,(ecase variant + (:without-gcing + `(without-gcing (funcall function))) + (:allow-with-interrupts + `(without-interrupts + (allow-with-interrupts (funcall function)))) + ((nil) + `(without-interrupts (funcall function))))))) + (def call-with-system-spinlock) + (def call-with-recursive-system-spinlock) + (def call-with-recursive-system-spinlock :without-gcing)) (defun call-with-mutex (function mutex value waitp) (declare (ignore mutex value waitp) @@ -149,55 +198,43 @@ provided the default value is used for the mutex." #!+sb-thread ;;; KLUDGE: These need to use DX-LET, because the cleanup form that -;;; closes over GOT-IT causes a value-cell to be allocated for it -- and -;;; we prefer that to go on the stack since it can. +;;; closes over GOT-IT causes a value-cell to be allocated for it -- +;;; and we prefer that to go on the stack since it can. (progn - (defun call-with-system-mutex (function mutex &optional without-gcing-p) - (declare (function function)) - (flet ((%call-with-system-mutex () - (dx-let (got-it) - (unwind-protect - (when (setf got-it (get-mutex mutex)) - (funcall function)) - (when got-it - (release-mutex mutex)))))) - (if without-gcing-p - (without-gcing - (%call-with-system-mutex)) - (without-interrupts - (allow-with-interrupts (%call-with-system-mutex)))))) - - (defun call-with-system-spinlock (function spinlock &optional without-gcing-p) - (declare (function function)) - (flet ((%call-with-system-spinlock () - (dx-let (got-it) - (unwind-protect - (when (setf got-it (get-spinlock spinlock)) - (funcall function)) - (when got-it - (release-spinlock spinlock)))))) - (if without-gcing-p - (without-gcing - (%call-with-system-spinlock)) - (without-interrupts - (allow-with-interrupts (%call-with-system-spinlock)))))) - - (defun call-with-recursive-system-spinlock (function lock - &optional without-gcing-p) + (defun call-with-system-spinlock (function spinlock) (declare (function function)) - (flet ((%call-with-system-spinlock () - (dx-let ((inner-lock-p (eq *current-thread* (spinlock-value lock))) - (got-it nil)) - (unwind-protect - (when (or inner-lock-p (setf got-it (get-spinlock lock))) - (funcall function)) - (when got-it - (release-spinlock lock)))))) - (if without-gcing-p - (without-gcing - (%call-with-system-spinlock)) - (without-interrupts - (allow-with-interrupts (%call-with-system-spinlock)))))) + (without-interrupts + (dx-let (got-it) + (unwind-protect + (when (setf got-it (get-spinlock spinlock)) + (funcall function)) + (when got-it + (release-spinlock spinlock)))))) + + (macrolet ((def (name &optional variant) + `(defun ,(if variant (symbolicate name "/" variant) name) + (function spinlock) + (declare (function function)) + (flet ((%call-with-system-spinlock () + (dx-let ((inner-lock-p + (eq *current-thread* + (spinlock-value spinlock))) + (got-it nil)) + (unwind-protect + (when (or inner-lock-p + (setf got-it + (get-spinlock spinlock))) + (funcall function)) + (when got-it + (release-spinlock spinlock)))))) + (declare (inline %call-with-system-spinlock)) + ,(ecase variant + (:without-gcing + `(without-gcing (%call-with-system-spinlock))) + ((nil) + `(without-interrupts (%call-with-system-spinlock)))))))) + (def call-with-recursive-system-spinlock) + (def call-with-recursive-system-spinlock :without-gcing)) (defun call-with-spinlock (function spinlock) (declare (function function)) @@ -233,8 +270,6 @@ provided the default value is used for the mutex." (when got-it (release-mutex mutex)))))) - - (defun call-with-recursive-spinlock (function spinlock) (declare (function function)) (dx-let ((inner-lock-p (eq (spinlock-value spinlock) *current-thread*))