mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-43198: Revert 3dd2157 that removed freeslot tracking. (#25010)

Browse source
This commit is contained in:
Raymond Hettinger 2021-03-24 15:33:27 -07:00 • committed by GitHub
parent 8efad61963
commit 72789592a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/setobject.c
View file

@ -103,6 +103,7 @@ static int
set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash) set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
{ {
setentry *table; setentry *table;
setentry *freeslot;
setentry *entry; setentry *entry;
size_t perturb; size_t perturb;
size_t mask; size_t mask;
@ -118,6 +119,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
mask = so->mask; mask = so->mask;
i = (size_t)hash & mask; i = (size_t)hash & mask;
freeslot = NULL;
perturb = hash; perturb = hash;
while (1) { while (1) {
@ -125,7 +127,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
probes = (i + LINEAR_PROBES <= mask) ? LINEAR_PROBES: 0; probes = (i + LINEAR_PROBES <= mask) ? LINEAR_PROBES: 0;
do { do {
if (entry->hash == 0 && entry->key == NULL) if (entry->hash == 0 && entry->key == NULL)
goto found_unused; goto found_unused_or_dummy;
if (entry->hash == hash) { if (entry->hash == hash) {
PyObject *startkey = entry->key; PyObject *startkey = entry->key;
assert(startkey != dummy); assert(startkey != dummy);
@ -147,12 +149,24 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
goto restart; goto restart;
mask = so->mask; mask = so->mask;
} }
else if (entry->hash == -1) {
assert (entry->key == dummy);
freeslot = entry;
}
entry++; entry++;
} while (probes--); } while (probes--);
perturb >>= PERTURB_SHIFT; perturb >>= PERTURB_SHIFT;
i = (i * 5 + 1 + perturb) & mask; i = (i * 5 + 1 + perturb) & mask;
} }
found_unused_or_dummy:
if (freeslot == NULL)
goto found_unused;
so->used++;
freeslot->key = key;
freeslot->hash = hash;
return 0;
found_unused: found_unused:
so->fill++; so->fill++;
so->used++; so->used++;