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

dict: Internal cleanup (GH-31641) 

* Make empty_key from split table to combined table.
* Use unicode_get_hash() when possible.
This commit is contained in:
Inada Naoki 2022-03-02 19:05:12 +09:00 committed by GitHub
parent 20a1c8ee4b
commit 03642df1a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Objects/dictobject.c
View File

@ -454,7 +454,7 @@ static PyDictKeysObject empty_keys_struct = {
1, /* dk_refcnt */ 1, /* dk_refcnt */
0, /* dk_log2_size */ 0, /* dk_log2_size */
0, /* dk_log2_index_bytes */ 0, /* dk_log2_index_bytes */
DICT_KEYS_SPLIT, /* dk_kind */ DICT_KEYS_UNICODE, /* dk_kind */
1, /* dk_version */ 1, /* dk_version */
0, /* dk_usable (immutable) */ 0, /* dk_usable (immutable) */
0, /* dk_nentries */ 0, /* dk_nentries */
@ -462,16 +462,6 @@ static PyDictKeysObject empty_keys_struct = {
DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY}, /* dk_indices */ DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY, DKIX_EMPTY}, /* dk_indices */
}; };
struct {
uint8_t prefix[sizeof(PyObject *)];
PyDictValues values;
} empty_values_struct = {
{ [sizeof(PyObject *)-1] = sizeof(PyObject *) },
{{NULL}}
};
#define empty_values (&empty_values_struct.values)
#define Py_EMPTY_KEYS &empty_keys_struct #define Py_EMPTY_KEYS &empty_keys_struct
/* Uncomment to check the dict content in _PyDict_CheckConsistency() */ /* Uncomment to check the dict content in _PyDict_CheckConsistency() */
@ -495,7 +485,6 @@ get_index_from_order(PyDictObject *mp, Py_ssize_t i)
static void static void
dump_entries(PyDictKeysObject *dk) dump_entries(PyDictKeysObject *dk)
{ {
int kind = dk->dk_kind;
for (Py_ssize_t i = 0; i < dk->dk_nentries; i++) { for (Py_ssize_t i = 0; i < dk->dk_nentries; i++) {
if (DK_IS_UNICODE(dk)) { if (DK_IS_UNICODE(dk)) {
PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(dk)[i]; PyDictUnicodeEntry *ep = &DK_UNICODE_ENTRIES(dk)[i];
@ -531,7 +520,7 @@ _PyDict_CheckConsistency(PyObject *op, int check_content)
if (!splitted) { if (!splitted) {
/* combined table */ /* combined table */
CHECK(keys->dk_kind != DICT_KEYS_SPLIT); CHECK(keys->dk_kind != DICT_KEYS_SPLIT);
CHECK(keys->dk_refcnt == 1); CHECK(keys->dk_refcnt == 1 || keys == Py_EMPTY_KEYS);
} }
else { else {
CHECK(keys->dk_kind == DICT_KEYS_SPLIT); CHECK(keys->dk_kind == DICT_KEYS_SPLIT);
@ -688,7 +677,8 @@ free_keys_object(PyDictKeysObject *keys)
// free_keys_object() must not be called after _PyDict_Fini() // free_keys_object() must not be called after _PyDict_Fini()
assert(state->keys_numfree != -1); assert(state->keys_numfree != -1);
#endif #endif
if (DK_LOG_SIZE(keys) == PyDict_LOG_MINSIZE && state->keys_numfree < PyDict_MAXFREELIST if (DK_LOG_SIZE(keys) == PyDict_LOG_MINSIZE
&& state->keys_numfree < PyDict_MAXFREELIST
&& DK_IS_UNICODE(keys)) { && DK_IS_UNICODE(keys)) {
state->keys_free_list[state->keys_numfree++] = keys; state->keys_free_list[state->keys_numfree++] = keys;
return; return;
@ -845,7 +835,7 @@ PyObject *
PyDict_New(void) PyDict_New(void)
{ {
dictkeys_incref(Py_EMPTY_KEYS); dictkeys_incref(Py_EMPTY_KEYS);
return new_dict(Py_EMPTY_KEYS, empty_values, 0, 0); return new_dict(Py_EMPTY_KEYS, NULL, 0, 0);
} }
/* Search index of hash table from offset of entry table */ /* Search index of hash table from offset of entry table */
@ -1478,9 +1468,7 @@ dictresize(PyDictObject *mp, uint8_t log2_newsize, int unicode)
} }
dictkeys_decref(oldkeys); dictkeys_decref(oldkeys);
mp->ma_values = NULL; mp->ma_values = NULL;
if (oldvalues != empty_values) { free_values(oldvalues);
free_values(oldvalues);
}
} }
else { // oldkeys is combined. else { // oldkeys is combined.
if (oldkeys->dk_kind == DICT_KEYS_GENERAL) { if (oldkeys->dk_kind == DICT_KEYS_GENERAL) {
@ -1506,7 +1494,7 @@ dictresize(PyDictObject *mp, uint8_t log2_newsize, int unicode)
if (unicode) { // combined unicode -> combined unicode if (unicode) { // combined unicode -> combined unicode
PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(mp->ma_keys); PyDictUnicodeEntry *newentries = DK_UNICODE_ENTRIES(mp->ma_keys);
if (oldkeys->dk_nentries == numentries && mp->ma_keys->dk_kind == DICT_KEYS_UNICODE) { if (oldkeys->dk_nentries == numentries && mp->ma_keys->dk_kind == DICT_KEYS_UNICODE) {
memcpy(newentries, oldentries, numentries * sizeof(PyDictUnicodeEntry)); memcpy(newentries, oldentries, numentries * sizeof(PyDictUnicodeEntry));
} }
else { else {
PyDictUnicodeEntry *ep = oldentries; PyDictUnicodeEntry *ep = oldentries;
@ -1533,27 +1521,31 @@ dictresize(PyDictObject *mp, uint8_t log2_newsize, int unicode)
} }
} }
assert(oldkeys->dk_kind != DICT_KEYS_SPLIT); // We can not use free_keys_object here because key's reference
assert(oldkeys->dk_refcnt == 1); // are moved already.
if (oldkeys != Py_EMPTY_KEYS) {
assert(oldkeys->dk_kind != DICT_KEYS_SPLIT);
assert(oldkeys->dk_refcnt == 1);
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
_Py_RefTotal--; _Py_RefTotal--;
#endif #endif
#if PyDict_MAXFREELIST > 0 #if PyDict_MAXFREELIST > 0
struct _Py_dict_state *state = get_dict_state(); struct _Py_dict_state *state = get_dict_state();
#ifdef Py_DEBUG #ifdef Py_DEBUG
// dictresize() must not be called after _PyDict_Fini() // dictresize() must not be called after _PyDict_Fini()
assert(state->keys_numfree != -1); assert(state->keys_numfree != -1);
#endif #endif
if (DK_LOG_SIZE(oldkeys) == PyDict_LOG_MINSIZE && if (DK_LOG_SIZE(oldkeys) == PyDict_LOG_MINSIZE &&
DK_IS_UNICODE(oldkeys) && DK_IS_UNICODE(oldkeys) &&
state->keys_numfree < PyDict_MAXFREELIST) state->keys_numfree < PyDict_MAXFREELIST)
{ {
state->keys_free_list[state->keys_numfree++] = oldkeys; state->keys_free_list[state->keys_numfree++] = oldkeys;
} }
else else
#endif #endif
{ {
PyObject_Free(oldkeys); PyObject_Free(oldkeys);
}
} }
} }
@ -1844,9 +1836,7 @@ _PyDict_LoadGlobal(PyDictObject *globals, PyDictObject *builtins, PyObject *key)
Py_hash_t hash; Py_hash_t hash;
PyObject *value; PyObject *value;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1)
{
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -1873,9 +1863,7 @@ _PyDict_SetItem_Take2(PyDictObject *mp, PyObject *key, PyObject *value)
assert(value); assert(value);
assert(PyDict_Check(mp)); assert(PyDict_Check(mp));
Py_hash_t hash; Py_hash_t hash;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1)
{
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) { if (hash == -1) {
Py_DECREF(key); Py_DECREF(key);
@ -1998,8 +1986,7 @@ PyDict_DelItem(PyObject *op, PyObject *key)
{ {
Py_hash_t hash; Py_hash_t hash;
assert(key); assert(key);
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return -1; return -1;
@ -2091,12 +2078,13 @@ PyDict_Clear(PyObject *op)
mp = ((PyDictObject *)op); mp = ((PyDictObject *)op);
oldkeys = mp->ma_keys; oldkeys = mp->ma_keys;
oldvalues = mp->ma_values; oldvalues = mp->ma_values;
if (oldvalues == empty_values) if (oldkeys == Py_EMPTY_KEYS) {
return; return;
}
/* Empty the dict... */ /* Empty the dict... */
dictkeys_incref(Py_EMPTY_KEYS); dictkeys_incref(Py_EMPTY_KEYS);
mp->ma_keys = Py_EMPTY_KEYS; mp->ma_keys = Py_EMPTY_KEYS;
mp->ma_values = empty_values; mp->ma_values = NULL;
mp->ma_used = 0; mp->ma_used = 0;
mp->ma_version_tag = DICT_NEXT_VERSION(); mp->ma_version_tag = DICT_NEXT_VERSION();
/* ...then clear the keys and values */ /* ...then clear the keys and values */
@ -2257,8 +2245,7 @@ _PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
_PyErr_SetKeyError(key); _PyErr_SetKeyError(key);
return NULL; return NULL;
} }
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -2372,16 +2359,14 @@ dict_dealloc(PyDictObject *mp)
PyObject_GC_UnTrack(mp); PyObject_GC_UnTrack(mp);
Py_TRASHCAN_BEGIN(mp, dict_dealloc) Py_TRASHCAN_BEGIN(mp, dict_dealloc)
if (values != NULL) { if (values != NULL) {
if (values != empty_values) { for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) {
for (i = 0, n = mp->ma_keys->dk_nentries; i < n; i++) { Py_XDECREF(values->values[i]);
Py_XDECREF(values->values[i]);
}
free_values(values);
} }
free_values(values);
dictkeys_decref(keys); dictkeys_decref(keys);
} }
else if (keys != NULL) { else if (keys != NULL) {
assert(keys->dk_refcnt == 1); assert(keys->dk_refcnt == 1 || keys == Py_EMPTY_KEYS);
dictkeys_decref(keys); dictkeys_decref(keys);
} }
#if PyDict_MAXFREELIST > 0 #if PyDict_MAXFREELIST > 0
@ -2498,8 +2483,7 @@ dict_subscript(PyDictObject *mp, PyObject *key)
Py_hash_t hash; Py_hash_t hash;
PyObject *value; PyObject *value;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -2862,9 +2846,7 @@ dict_merge(PyObject *a, PyObject *b, int override)
dictkeys_decref(mp->ma_keys); dictkeys_decref(mp->ma_keys);
mp->ma_keys = keys; mp->ma_keys = keys;
if (mp->ma_values != NULL) { if (mp->ma_values != NULL) {
if (mp->ma_values != empty_values) { free_values(mp->ma_values);
free_values(mp->ma_values);
}
mp->ma_values = NULL; mp->ma_values = NULL;
} }
@ -3257,8 +3239,7 @@ dict___contains__(PyDictObject *self, PyObject *key)
Py_ssize_t ix; Py_ssize_t ix;
PyObject *value; PyObject *value;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -3289,8 +3270,7 @@ dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
Py_hash_t hash; Py_hash_t hash;
Py_ssize_t ix; Py_ssize_t ix;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -3317,8 +3297,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
return NULL; return NULL;
} }
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return NULL; return NULL;
@ -3707,8 +3686,7 @@ PyDict_Contains(PyObject *op, PyObject *key)
PyDictObject *mp = (PyDictObject *)op; PyDictObject *mp = (PyDictObject *)op;
PyObject *value; PyObject *value;
if (!PyUnicode_CheckExact(key) || if (!PyUnicode_CheckExact(key) || (hash = unicode_get_hash(key)) == -1) {
(hash = ((PyASCIIObject *) key)->hash) == -1) {
hash = PyObject_Hash(key); hash = PyObject_Hash(key);
if (hash == -1) if (hash == -1)
return -1; return -1;
@ -3780,7 +3758,7 @@ dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
d->ma_version_tag = DICT_NEXT_VERSION(); d->ma_version_tag = DICT_NEXT_VERSION();
dictkeys_incref(Py_EMPTY_KEYS); dictkeys_incref(Py_EMPTY_KEYS);
d->ma_keys = Py_EMPTY_KEYS; d->ma_keys = Py_EMPTY_KEYS;
d->ma_values = empty_values; d->ma_values = NULL;
ASSERT_CONSISTENT(d); ASSERT_CONSISTENT(d);
if (type != &PyDict_Type) { if (type != &PyDict_Type) {