X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fhash-table.lisp;h=4b3da969b7f11a055383829029a3f93e6d827230;hb=b56c1a4dc22aa0ac827343667584aa6090b15f02;hp=933b3905bf6e1177c8992dc6639071e160cea330;hpb=2b47574f810d541bf36f7efdf89650d8ca14d3ca;p=sbcl.git diff --git a/src/code/hash-table.lisp b/src/code/hash-table.lisp index 933b390..4b3da96 100644 --- a/src/code/hash-table.lisp +++ b/src/code/hash-table.lisp @@ -67,8 +67,8 @@ ;; respective key. (hash-vector nil :type (or null (simple-array sb!vm:word (*)))) ;; Used for locking GETHASH/(SETF GETHASH)/REMHASH - (spinlock (sb!thread::make-spinlock :name "hash-table lock") - :type sb!thread::spinlock :read-only t) + (lock (sb!thread:make-mutex :name "hash-table lock") + :type sb!thread:mutex :read-only t) ;; The GC will set this to T if it moves an EQ-based key. This used ;; to be signaled by a bit in the header of the kv vector, but that ;; implementation caused some concurrency issues when we stopped @@ -144,10 +144,10 @@ unspecified." ;; Needless to say, this also excludes some internal bits, but ;; getting there is too much detail when "unspecified" says what ;; is important -- unpredictable, but harmless. - `(sb!thread::with-recursive-spinlock ((hash-table-spinlock ,hash-table)) + `(sb!thread::with-recursive-lock ((hash-table-lock ,hash-table)) ,@body)) (defmacro-mundanely with-locked-system-table ((hash-table) &body body) - `(sb!thread::with-recursive-system-spinlock - ((hash-table-spinlock ,hash-table)) + `(sb!thread::with-recursive-system-lock + ((hash-table-lock ,hash-table)) ,@body))