X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fhash-table.lisp;h=c7afa7ecf2deef1c3a10d2967311e1961a55a64b;hb=0c3bbfaa2286626a2d915c8810f690aefc702661;hp=23f7b0f2798f90e319675658f267786497f96956;hpb=4fc3360c666dd7a47a58b988ae243a7d56624e68;p=sbcl.git diff --git a/src/code/hash-table.lisp b/src/code/hash-table.lisp index 23f7b0f..c7afa7e 100644 --- a/src/code/hash-table.lisp +++ b/src/code/hash-table.lisp @@ -24,12 +24,12 @@ ;; values: the index hashing and T if that might change with the ;; next GC. (hash-fun (missing-arg) :type function :read-only t) - ;; how much to grow the hash table by when it fills up. If an index, + ;; How much to grow the hash table by when it fills up. If an index, ;; then add that amount. If a floating point number, then multiply ;; it by that. (rehash-size (missing-arg) :type (or index (single-float (1.0))) :read-only t) - ;; how full the hash table has to get before we rehash + ;; How full the hash table has to get before we rehash (rehash-threshold (missing-arg) :type (single-float (0.0) 1.0) :read-only t) ;; The number of entries before a rehash, just one less than the ;; size of the next-vector, hash-vector, and half the size of the @@ -54,33 +54,35 @@ (cache nil :type (or null index)) ;; The index vector. This may be larger than the hash size to help ;; reduce collisions. - (index-vector (missing-arg) - :type (simple-array (unsigned-byte #.sb!vm:n-word-bits) (*))) + (index-vector (missing-arg) :type (simple-array sb!vm:word (*))) ;; This table parallels the KV vector, and is used to chain together ;; the hash buckets and the free list. A slot will only ever be in ;; one of these lists. - (next-vector (missing-arg) - :type (simple-array (unsigned-byte #.sb!vm:n-word-bits) (*))) + (next-vector (missing-arg) :type (simple-array sb!vm:word (*))) ;; This table parallels the KV table, and can be used to store the ;; hash associated with the key, saving recalculation. Could be ;; useful for EQL, and EQUAL hash tables. This table is not needed ;; for EQ hash tables, and when present the value of ;; +MAGIC-HASH-VECTOR-VALUE+ represents EQ-based hashing on the ;; respective key. - (hash-vector nil :type (or null (simple-array (unsigned-byte - #.sb!vm:n-word-bits) (*)))) - ;; Used for locking GETHASH/(SETF GETHASH)/REMHASH for tables with :LOCK-P T - (spinlock (sb!thread::make-spinlock) :type sb!thread::spinlock) + (hash-vector nil :type (or null (simple-array sb!vm:word (*)))) + ;; Used for locking GETHASH/(SETF GETHASH)/REMHASH + (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 ;; inhibiting GC during hash-table lookup. (needs-rehash-p nil :type (member nil t)) + ;; Has user requested synchronization? + (synchronized-p nil :type (member nil t) :read-only t) ;; For detecting concurrent accesses. #!+sb-hash-table-debug - (concurrent-access-error t :type (member nil t)) + (signal-concurrent-access t :type (member nil t)) #!+sb-hash-table-debug - (accessing-thread nil)) + (reading-thread nil) + #!+sb-hash-table-debug + (writing-thread nil)) ;; as explained by pmai on openprojects #lisp IRC 2002-07-30: #x80000000 ;; is bigger than any possible nonEQ hash value, and thus indicates an @@ -90,31 +92,32 @@ ;; the generational garbage collector needs to know it. (defconstant +magic-hash-vector-value+ (ash 1 (1- sb!vm:n-word-bits))) - -(defmacro-mundanely with-hash-table-iterator ((function hash-table) &body body) +(defmacro-mundanely with-hash-table-iterator ((name hash-table) &body body) #!+sb-doc - "WITH-HASH-TABLE-ITERATOR ((function hash-table) &body body) + "WITH-HASH-TABLE-ITERATOR ((name hash-table) &body body) -Provides a method of manually looping over the elements of a -hash-table. FUNCTION is bound to a generator-macro that, within the -scope of the invocation, returns one or three values. The first value -tells whether any objects remain in the hash table. When the first -value is non-NIL, the second and third values are the key and the -value of the next object. +Provides a method of manually looping over the elements of a hash-table. NAME +is bound to a generator-macro that, within the scope of the invocation, +returns one or three values. The first value tells whether any objects remain +in the hash table. When the first value is non-NIL, the second and third +values are the key and the value of the next object. -Consequences are undefined if HASH-TABLE is mutated during execution -of BODY, except for changing or removing elements corresponding to the -current key." +Consequences are undefined if HASH-TABLE is mutated during execution of BODY, +except for changing or removing elements corresponding to the current key. The +applies to all threads, not just the current one -- even for synchronized +hash-tables. If the table may be mutated by another thread during iteration, +use eg. SB-EXT:WITH-LOCKED-HASH-TABLE to protect the WITH-HASH-TABLE-ITERATOR +for." ;; This essentially duplicates MAPHASH, so any changes here should ;; be reflected there as well. - (let ((n-function (gensym "WITH-HASH-TABLE-ITERATOR-"))) - `(let ((,n-function + (let ((function (make-symbol (concatenate 'string (symbol-name name) "-FUN")))) + `(let ((,function (let* ((table ,hash-table) (length (length (hash-table-next-vector table))) (index 1)) (declare (type index/2 index)) (labels - ((,function () + ((,name () ;; (We grab the table again on each iteration just in ;; case it was rehashed by a PUTHASH.) (let ((kv-vector (hash-table-table table))) @@ -124,8 +127,27 @@ current key." (value (aref kv-vector (1+ (* 2 index))))) (incf index) (unless (or (eq key +empty-ht-slot+) - (eq value +empty-ht-slot+)) + (eq value +empty-ht-slot+)) (return (values t key value)))))))) - #',function)))) - (macrolet ((,function () '(funcall ,n-function))) - ,@body)))) + #',name)))) + (macrolet ((,name () '(funcall ,function))) + ,@body)))) + +(defmacro-mundanely with-locked-hash-table ((hash-table) &body body) + #!+sb-doc + "Limits concurrent accesses to HASH-TABLE for the duration of BODY. +If HASH-TABLE is synchronized, BODY will execute with exclusive +ownership of the table. If HASH-TABLE is not synchronized, BODY will +execute with other WITH-LOCKED-HASH-TABLE bodies excluded -- exclusion +of hash-table accesses not surrounded by WITH-LOCKED-HASH-TABLE is +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-lock ((hash-table-lock ,hash-table)) + ,@body)) + +(defmacro-mundanely with-locked-system-table ((hash-table) &body body) + `(sb!thread::with-recursive-system-lock + ((hash-table-lock ,hash-table)) + ,@body))