traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
Raymond Hettinger 2013-05-17 03:24:54 -07:00
parent 5c71079d06 36f74aa7f7
commit 2f6fe51860
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Objects/dictobject.c
View File

@ -305,14 +305,18 @@ PyDict_Fini(void)
* #define USABLE_FRACTION(n) (((n) >> 1) + ((n) >> 2) - ((n) >> 3)) * #define USABLE_FRACTION(n) (((n) >> 1) + ((n) >> 2) - ((n) >> 3))
*/ */
/* GROWTH_RATE. Growth rate upon hitting maximum load. Currently set to *2. /* GROWTH_RATE. Growth rate upon hitting maximum load.
* Raising this to *4 doubles memory consumption depending on the size of * Currently set to used*2 + capacity/2.
* This means that dicts double in size when growing without deletions,
* but have more head room when the number of deletions is on a par with the
* number of insertions.
* Raising this to used*4 doubles memory consumption depending on the size of
* the dictionary, but results in half the number of resizes, less effort to * the dictionary, but results in half the number of resizes, less effort to
* resize and better sparseness for some (but not all dict sizes). * resize.
* Setting to *4 eliminates every other resize step. * GROWTH_RATE was set to used*4 up to version 3.2.
* GROWTH_RATE was set to *4 up to version 3.2. * GROWTH_RATE was set to used*2 in version 3.3.0
*/ */
#define GROWTH_RATE(x) ((x) * 2) #define GROWTH_RATE(d) (((d)->ma_used*2)+((d)->ma_keys->dk_size>>1))
#define ENSURE_ALLOWS_DELETIONS(d) \ #define ENSURE_ALLOWS_DELETIONS(d) \
if ((d)->ma_keys->dk_lookup == lookdict_unicode_nodummy) { \ if ((d)->ma_keys->dk_lookup == lookdict_unicode_nodummy) { \
@ -790,7 +794,7 @@ find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash,
static int static int
insertion_resize(PyDictObject *mp) insertion_resize(PyDictObject *mp)
{ {
return dictresize(mp, GROWTH_RATE(mp->ma_used)); return dictresize(mp, GROWTH_RATE(mp));
} }
/* /*