mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-35230: dict: Remove some macros (GH-10513)

Browse source 
Remove _Py_REF_DEBUG_COMMA, DK_DEBUG_INCREF, and DK_DEBUG_DECREF.
Convert DK_INCREF and DK_DECREF to static inline functions.
This commit is contained in:
INADA Naoki 2018-11-14 18:39:27 +09:00 • committed by GitHub
parent 8e0b05e2f4
commit a757649fd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/object.h
View file

@ -734,7 +734,6 @@ PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno,
PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void);
#define _Py_INC_REFTOTAL _Py_RefTotal++ #define _Py_INC_REFTOTAL _Py_RefTotal++
#define _Py_DEC_REFTOTAL _Py_RefTotal-- #define _Py_DEC_REFTOTAL _Py_RefTotal--
#define _Py_REF_DEBUG_COMMA ,
/* Py_REF_DEBUG also controls the display of refcounts and memory block /* Py_REF_DEBUG also controls the display of refcounts and memory block
* allocations at the interactive prompt and at interpreter shutdown * allocations at the interactive prompt and at interpreter shutdown
@ -743,7 +742,6 @@ PyAPI_FUNC(void) _PyDebug_PrintTotalRefs(void);
#else #else
#define _Py_INC_REFTOTAL #define _Py_INC_REFTOTAL
#define _Py_DEC_REFTOTAL #define _Py_DEC_REFTOTAL
#define _Py_REF_DEBUG_COMMA
#endif /* Py_REF_DEBUG */ #endif /* Py_REF_DEBUG */
#ifdef COUNT_ALLOCS #ifdef COUNT_ALLOCS

101
Objects/dictobject.c
View file

@ -302,17 +302,31 @@ PyDict_Fini(void)
#define DK_ENTRIES(dk) \ #define DK_ENTRIES(dk) \
((PyDictKeyEntry*)(&((int8_t*)((dk)->dk_indices))[DK_SIZE(dk) * DK_IXSIZE(dk)])) ((PyDictKeyEntry*)(&((int8_t*)((dk)->dk_indices))[DK_SIZE(dk) * DK_IXSIZE(dk)]))
#define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA
#define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA
#define DK_INCREF(dk) (DK_DEBUG_INCREF ++(dk)->dk_refcnt)
#define DK_DECREF(dk) if (DK_DEBUG_DECREF (--(dk)->dk_refcnt) == 0) free_keys_object(dk)
#define DK_MASK(dk) (((dk)->dk_size)-1) #define DK_MASK(dk) (((dk)->dk_size)-1)
#define IS_POWER_OF_2(x) (((x) & (x-1)) == 0) #define IS_POWER_OF_2(x) (((x) & (x-1)) == 0)
static void free_keys_object(PyDictKeysObject *keys);
static inline void
dictkeys_incref(PyDictKeysObject *dk)
{
_Py_INC_REFTOTAL;
dk->dk_refcnt++;
}
static inline void
dictkeys_decref(PyDictKeysObject *dk)
{
assert(dk->dk_refcnt > 0);
_Py_DEC_REFTOTAL;
if (--dk->dk_refcnt == 0) {
free_keys_object(dk);
}
}
/* lookup indices. returns DKIX_EMPTY, DKIX_DUMMY, or ix >=0 */ /* lookup indices. returns DKIX_EMPTY, DKIX_DUMMY, or ix >=0 */
static inline Py_ssize_t static inline Py_ssize_t
dk_get_index(PyDictKeysObject *keys, Py_ssize_t i) dictkeys_get_index(PyDictKeysObject *keys, Py_ssize_t i)
{ {
Py_ssize_t s = DK_SIZE(keys); Py_ssize_t s = DK_SIZE(keys);
Py_ssize_t ix; Py_ssize_t ix;
@ -341,7 +355,7 @@ dk_get_index(PyDictKeysObject *keys, Py_ssize_t i)
/* write to indices. */ /* write to indices. */
static inline void static inline void
dk_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix) dictkeys_set_index(PyDictKeysObject *keys, Py_ssize_t i, Py_ssize_t ix)
{ {
Py_ssize_t s = DK_SIZE(keys); Py_ssize_t s = DK_SIZE(keys);
@ -464,7 +478,7 @@ _PyDict_CheckConsistency(PyDictObject *mp)
#ifdef DEBUG_PYDICT #ifdef DEBUG_PYDICT
for (i=0; i < keys->dk_size; i++) { for (i=0; i < keys->dk_size; i++) {
Py_ssize_t ix = dk_get_index(keys, i); Py_ssize_t ix = dictkeys_get_index(keys, i);
ASSERT(DKIX_DUMMY <= ix && ix <= usable); ASSERT(DKIX_DUMMY <= ix && ix <= usable);
} }
@ -543,7 +557,8 @@ static PyDictKeysObject *new_keys_object(Py_ssize_t size)
return NULL; return NULL;
} }
} }
DK_DEBUG_INCREF dk->dk_refcnt = 1; _Py_INC_REFTOTAL;
dk->dk_refcnt = 1;
dk->dk_size = size; dk->dk_size = size;
dk->dk_usable = usable; dk->dk_usable = usable;
dk->dk_lookup = lookdict_unicode_nodummy; dk->dk_lookup = lookdict_unicode_nodummy;
@ -587,7 +602,7 @@ new_dict(PyDictKeysObject *keys, PyObject **values)
else { else {
mp = PyObject_GC_New(PyDictObject, &PyDict_Type); mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
if (mp == NULL) { if (mp == NULL) {
DK_DECREF(keys); dictkeys_decref(keys);
free_values(values); free_values(values);
return NULL; return NULL;
} }
@ -610,7 +625,7 @@ new_dict_with_shared_keys(PyDictKeysObject *keys)
size = USABLE_FRACTION(DK_SIZE(keys)); size = USABLE_FRACTION(DK_SIZE(keys));
values = new_values(size); values = new_values(size);
if (values == NULL) { if (values == NULL) {
DK_DECREF(keys); dictkeys_decref(keys);
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
@ -665,7 +680,7 @@ clone_combined_dict(PyDictObject *orig)
/* Since we copied the keys table we now have an extra reference /* Since we copied the keys table we now have an extra reference
in the system. Manually call _Py_INC_REFTOTAL to signal that in the system. Manually call _Py_INC_REFTOTAL to signal that
we have it now; calling DK_INCREF would be an error as we have it now; calling dictkeys_incref would be an error as
keys->dk_refcnt is already set to 1 (after memcpy). */ keys->dk_refcnt is already set to 1 (after memcpy). */
_Py_INC_REFTOTAL; _Py_INC_REFTOTAL;
@ -690,7 +705,7 @@ lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index)
size_t i = (size_t)hash & mask; size_t i = (size_t)hash & mask;
for (;;) { for (;;) {
Py_ssize_t ix = dk_get_index(k, i); Py_ssize_t ix = dictkeys_get_index(k, i);
if (ix == index) { if (ix == index) {
return i; return i;
} }
@ -743,7 +758,7 @@ top:
i = (size_t)hash & mask; i = (size_t)hash & mask;
for (;;) { for (;;) {
Py_ssize_t ix = dk_get_index(dk, i); Py_ssize_t ix = dictkeys_get_index(dk, i);
if (ix == DKIX_EMPTY) { if (ix == DKIX_EMPTY) {
*value_addr = NULL; *value_addr = NULL;
return ix; return ix;
@ -803,7 +818,7 @@ lookdict_unicode(PyDictObject *mp, PyObject *key,
size_t i = (size_t)hash & mask; size_t i = (size_t)hash & mask;
for (;;) { for (;;) {
Py_ssize_t ix = dk_get_index(mp->ma_keys, i); Py_ssize_t ix = dictkeys_get_index(mp->ma_keys, i);
if (ix == DKIX_EMPTY) { if (ix == DKIX_EMPTY) {
*value_addr = NULL; *value_addr = NULL;
return DKIX_EMPTY; return DKIX_EMPTY;
@ -846,7 +861,7 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
size_t i = (size_t)hash & mask; size_t i = (size_t)hash & mask;
for (;;) { for (;;) {
Py_ssize_t ix = dk_get_index(mp->ma_keys, i); Py_ssize_t ix = dictkeys_get_index(mp->ma_keys, i);
assert (ix != DKIX_DUMMY); assert (ix != DKIX_DUMMY);
if (ix == DKIX_EMPTY) { if (ix == DKIX_EMPTY) {
*value_addr = NULL; *value_addr = NULL;
@ -891,7 +906,7 @@ lookdict_split(PyDictObject *mp, PyObject *key,
size_t i = (size_t)hash & mask; size_t i = (size_t)hash & mask;
for (;;) { for (;;) {
Py_ssize_t ix = dk_get_index(mp->ma_keys, i); Py_ssize_t ix = dictkeys_get_index(mp->ma_keys, i);
assert (ix != DKIX_DUMMY); assert (ix != DKIX_DUMMY);
if (ix == DKIX_EMPTY) { if (ix == DKIX_EMPTY) {
*value_addr = NULL; *value_addr = NULL;
@ -983,11 +998,11 @@ find_empty_slot(PyDictKeysObject *keys, Py_hash_t hash)
const size_t mask = DK_MASK(keys); const size_t mask = DK_MASK(keys);
size_t i = hash & mask; size_t i = hash & mask;
Py_ssize_t ix = dk_get_index(keys, i); Py_ssize_t ix = dictkeys_get_index(keys, i);
for (size_t perturb = hash; ix >= 0;) { for (size_t perturb = hash; ix >= 0;) {
perturb >>= PERTURB_SHIFT; perturb >>= PERTURB_SHIFT;
i = (i*5 + perturb + 1) & mask; i = (i*5 + perturb + 1) & mask;
ix = dk_get_index(keys, i); ix = dictkeys_get_index(keys, i);
} }
return i; return i;
} }
@ -1044,7 +1059,7 @@ insertdict(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject *value)
} }
Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash); Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash);
ep = &DK_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries]; ep = &DK_ENTRIES(mp->ma_keys)[mp->ma_keys->dk_nentries];
dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); dictkeys_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries);
ep->me_key = key; ep->me_key = key;
ep->me_hash = hash; ep->me_hash = hash;
if (mp->ma_values) { if (mp->ma_values) {
@ -1098,11 +1113,11 @@ build_indices(PyDictKeysObject *keys, PyDictKeyEntry *ep, Py_ssize_t n)
for (Py_ssize_t ix = 0; ix != n; ix++, ep++) { for (Py_ssize_t ix = 0; ix != n; ix++, ep++) {
Py_hash_t hash = ep->me_hash; Py_hash_t hash = ep->me_hash;
size_t i = hash & mask; size_t i = hash & mask;
for (size_t perturb = hash; dk_get_index(keys, i) != DKIX_EMPTY;) { for (size_t perturb = hash; dictkeys_get_index(keys, i) != DKIX_EMPTY;) {
perturb >>= PERTURB_SHIFT; perturb >>= PERTURB_SHIFT;
i = mask & (i*5 + perturb + 1); i = mask & (i*5 + perturb + 1);
} }
dk_set_index(keys, i, ix); dictkeys_set_index(keys, i, ix);
} }
} }
@ -1171,7 +1186,7 @@ dictresize(PyDictObject *mp, Py_ssize_t minsize)
newentries[i].me_value = oldvalues[i]; newentries[i].me_value = oldvalues[i];
} }
DK_DECREF(oldkeys); dictkeys_decref(oldkeys);
mp->ma_values = NULL; mp->ma_values = NULL;
if (oldvalues != empty_values) { if (oldvalues != empty_values) {
free_values(oldvalues); free_values(oldvalues);
@ -1194,10 +1209,12 @@ dictresize(PyDictObject *mp, Py_ssize_t minsize)
assert(oldkeys->dk_refcnt == 1); assert(oldkeys->dk_refcnt == 1);
if (oldkeys->dk_size == PyDict_MINSIZE && if (oldkeys->dk_size == PyDict_MINSIZE &&
numfreekeys < PyDict_MAXFREELIST) { numfreekeys < PyDict_MAXFREELIST) {
DK_DEBUG_DECREF keys_free_list[numfreekeys++] = oldkeys; _Py_DEC_REFTOTAL;
keys_free_list[numfreekeys++] = oldkeys;
} }
else { else {
DK_DEBUG_DECREF PyObject_FREE(oldkeys); _Py_DEC_REFTOTAL;
PyObject_FREE(oldkeys);
} }
} }
@ -1247,7 +1264,7 @@ make_keys_shared(PyObject *op)
mp->ma_keys->dk_lookup = lookdict_split; mp->ma_keys->dk_lookup = lookdict_split;
mp->ma_values = values; mp->ma_values = values;
} }
DK_INCREF(mp->ma_keys); dictkeys_incref(mp->ma_keys);
return mp->ma_keys; return mp->ma_keys;
} }
@ -1499,7 +1516,7 @@ delitem_common(PyDictObject *mp, Py_hash_t hash, Py_ssize_t ix,
mp->ma_used--; mp->ma_used--;
mp->ma_version_tag = DICT_NEXT_VERSION(); mp->ma_version_tag = DICT_NEXT_VERSION();
ep = &DK_ENTRIES(mp->ma_keys)[ix]; ep = &DK_ENTRIES(mp->ma_keys)[ix];
dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); dictkeys_set_index(mp->ma_keys, hashpos, DKIX_DUMMY);
ENSURE_ALLOWS_DELETIONS(mp); ENSURE_ALLOWS_DELETIONS(mp);
old_key = ep->me_key; old_key = ep->me_key;
ep->me_key = NULL; ep->me_key = NULL;
@ -1630,7 +1647,7 @@ PyDict_Clear(PyObject *op)
if (oldvalues == empty_values) if (oldvalues == empty_values)
return; return;
/* Empty the dict... */ /* Empty the dict... */
DK_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 = empty_values;
mp->ma_used = 0; mp->ma_used = 0;
@ -1641,11 +1658,11 @@ PyDict_Clear(PyObject *op)
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
Py_CLEAR(oldvalues[i]); Py_CLEAR(oldvalues[i]);
free_values(oldvalues); free_values(oldvalues);
DK_DECREF(oldkeys); dictkeys_decref(oldkeys);
} }
else { else {
assert(oldkeys->dk_refcnt == 1); assert(oldkeys->dk_refcnt == 1);
DK_DECREF(oldkeys); dictkeys_decref(oldkeys);
} }
assert(_PyDict_CheckConsistency(mp)); assert(_PyDict_CheckConsistency(mp));
} }
@ -1769,7 +1786,7 @@ _PyDict_Pop_KnownHash(PyObject *dict, PyObject *key, Py_hash_t hash, PyObject *d
assert(old_value != NULL); assert(old_value != NULL);
mp->ma_used--; mp->ma_used--;
mp->ma_version_tag = DICT_NEXT_VERSION(); mp->ma_version_tag = DICT_NEXT_VERSION();
dk_set_index(mp->ma_keys, hashpos, DKIX_DUMMY); dictkeys_set_index(mp->ma_keys, hashpos, DKIX_DUMMY);
ep = &DK_ENTRIES(mp->ma_keys)[ix]; ep = &DK_ENTRIES(mp->ma_keys)[ix];
ENSURE_ALLOWS_DELETIONS(mp); ENSURE_ALLOWS_DELETIONS(mp);
old_key = ep->me_key; old_key = ep->me_key;
@ -1910,11 +1927,11 @@ dict_dealloc(PyDictObject *mp)
} }
free_values(values); free_values(values);
} }
DK_DECREF(keys); dictkeys_decref(keys);
} }
else if (keys != NULL) { else if (keys != NULL) {
assert(keys->dk_refcnt == 1); assert(keys->dk_refcnt == 1);
DK_DECREF(keys); dictkeys_decref(keys);
} }
if (numfree < PyDict_MAXFREELIST && Py_TYPE(mp) == &PyDict_Type) if (numfree < PyDict_MAXFREELIST && Py_TYPE(mp) == &PyDict_Type)
free_list[numfree++] = mp; free_list[numfree++] = mp;
@ -2563,7 +2580,7 @@ PyDict_Copy(PyObject *o)
split_copy->ma_keys = mp->ma_keys; split_copy->ma_keys = mp->ma_keys;
split_copy->ma_used = mp->ma_used; split_copy->ma_used = mp->ma_used;
split_copy->ma_version_tag = DICT_NEXT_VERSION(); split_copy->ma_version_tag = DICT_NEXT_VERSION();
DK_INCREF(mp->ma_keys); dictkeys_incref(mp->ma_keys);
for (i = 0, n = size; i < n; i++) { for (i = 0, n = size; i < n; i++) {
PyObject *value = mp->ma_values[i]; PyObject *value = mp->ma_values[i];
Py_XINCREF(value); Py_XINCREF(value);
@ -2828,7 +2845,7 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash); Py_ssize_t hashpos = find_empty_slot(mp->ma_keys, hash);
ep0 = DK_ENTRIES(mp->ma_keys); ep0 = DK_ENTRIES(mp->ma_keys);
ep = &ep0[mp->ma_keys->dk_nentries]; ep = &ep0[mp->ma_keys->dk_nentries];
dk_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries); dictkeys_set_index(mp->ma_keys, hashpos, mp->ma_keys->dk_nentries);
Py_INCREF(key); Py_INCREF(key);
Py_INCREF(value); Py_INCREF(value);
MAINTAIN_TRACKING(mp, key, value); MAINTAIN_TRACKING(mp, key, value);
@ -2949,8 +2966,8 @@ dict_popitem(PyDictObject *mp, PyObject *Py_UNUSED(ignored))
ep = &ep0[i]; ep = &ep0[i];
j = lookdict_index(mp->ma_keys, ep->me_hash, i); j = lookdict_index(mp->ma_keys, ep->me_hash, i);
assert(j >= 0); assert(j >= 0);
assert(dk_get_index(mp->ma_keys, j) == i); assert(dictkeys_get_index(mp->ma_keys, j) == i);
dk_set_index(mp->ma_keys, j, DKIX_DUMMY); dictkeys_set_index(mp->ma_keys, j, DKIX_DUMMY);
PyTuple_SET_ITEM(res, 0, ep->me_key); PyTuple_SET_ITEM(res, 0, ep->me_key);
PyTuple_SET_ITEM(res, 1, ep->me_value); PyTuple_SET_ITEM(res, 1, ep->me_value);
@ -4460,7 +4477,7 @@ PyObject_GenericGetDict(PyObject *obj, void *context)
if (dict == NULL) { if (dict == NULL) {
PyTypeObject *tp = Py_TYPE(obj); PyTypeObject *tp = Py_TYPE(obj);
if ((tp->tp_flags & Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) { if ((tp->tp_flags & Py_TPFLAGS_HEAPTYPE) && CACHED_KEYS(tp)) {
DK_INCREF(CACHED_KEYS(tp)); dictkeys_incref(CACHED_KEYS(tp));
*dictptr = dict = new_dict_with_shared_keys(CACHED_KEYS(tp)); *dictptr = dict = new_dict_with_shared_keys(CACHED_KEYS(tp));
} }
else { else {
@ -4484,7 +4501,7 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
assert(dictptr != NULL); assert(dictptr != NULL);
dict = *dictptr; dict = *dictptr;
if (dict == NULL) { if (dict == NULL) {
DK_INCREF(cached); dictkeys_incref(cached);
dict = new_dict_with_shared_keys(cached); dict = new_dict_with_shared_keys(cached);
if (dict == NULL) if (dict == NULL)
return -1; return -1;
@ -4496,7 +4513,7 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
// always converts dict to combined form. // always converts dict to combined form.
if ((cached = CACHED_KEYS(tp)) != NULL) { if ((cached = CACHED_KEYS(tp)) != NULL) {
CACHED_KEYS(tp) = NULL; CACHED_KEYS(tp) = NULL;
DK_DECREF(cached); dictkeys_decref(cached);
} }
} }
else { else {
@ -4525,7 +4542,7 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
else { else {
CACHED_KEYS(tp) = NULL; CACHED_KEYS(tp) = NULL;
} }
DK_DECREF(cached); dictkeys_decref(cached);
if (CACHED_KEYS(tp) == NULL && PyErr_Occurred()) if (CACHED_KEYS(tp) == NULL && PyErr_Occurred())
return -1; return -1;
} }
@ -4550,5 +4567,5 @@ _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr,
void void
_PyDictKeys_DecRef(PyDictKeysObject *keys) _PyDictKeys_DecRef(PyDictKeysObject *keys)
{ {
DK_DECREF(keys); dictkeys_decref(keys);
} }