mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor factoring: move redundant resize scaling logic into the resize function.

This commit is contained in:
Raymond Hettinger 2015-07-03 20:00:03 -07:00
parent 3c1f52e829
commit 4897300276
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/setobject.c
View File

@ -226,7 +226,7 @@ set_insert_key(PySetObject *so, PyObject *key, Py_hash_t hash)
entry->hash = hash; entry->hash = hash;
if ((size_t)so->fill*3 < mask*2) if ((size_t)so->fill*3 < mask*2)
return 0; return 0;
return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4); return set_table_resize(so, so->used);
found_active: found_active:
return 0; return 0;
@ -290,6 +290,7 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
setentry small_copy[PySet_MINSIZE]; setentry small_copy[PySet_MINSIZE];
assert(minused >= 0); assert(minused >= 0);
minused = (minused > 50000) ? minused * 2 : minused * 4;
/* Find the smallest table size > minused. */ /* Find the smallest table size > minused. */
/* XXX speed-up with intrinsics */ /* XXX speed-up with intrinsics */
@ -616,7 +617,7 @@ set_merge(PySetObject *so, PyObject *otherset)
* that there will be no (or few) overlapping keys. * that there will be no (or few) overlapping keys.
*/ */
if ((so->fill + other->used)*3 >= so->mask*2) { if ((so->fill + other->used)*3 >= so->mask*2) {
if (set_table_resize(so, (so->used + other->used)*2) != 0) if (set_table_resize(so, so->used + other->used) != 0)
return -1; return -1;
} }
so_entry = so->table; so_entry = so->table;
@ -965,7 +966,7 @@ set_update_internal(PySetObject *so, PyObject *other)
if (dictsize == -1) if (dictsize == -1)
return -1; return -1;
if ((so->fill + dictsize)*3 >= so->mask*2) { if ((so->fill + dictsize)*3 >= so->mask*2) {
if (set_table_resize(so, (so->used + dictsize)*2) != 0) if (set_table_resize(so, so->used + dictsize) != 0)
return -1; return -1;
} }
while (_PyDict_Next(other, &pos, &key, &value, &hash)) { while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
@ -1508,7 +1509,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
/* If more than 1/5 are dummies, then resize them away. */ /* If more than 1/5 are dummies, then resize them away. */
if ((so->fill - so->used) * 5 < so->mask) if ((so->fill - so->used) * 5 < so->mask)
return 0; return 0;
return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4); return set_table_resize(so, so->used);
} }
static PyObject * static PyObject *