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

gh-100227: Move next_keys_version to PyInterpreterState (gh-102335)

Browse source 
https://github.com/python/cpython/issues/100227
This commit is contained in:
Eric Snow 2023-03-08 18:04:16 -07:00 • committed by GitHub
parent 66ff374d4f
commit 5e5acd291f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/internal/pycore_dict.h
View file

@ -37,7 +37,8 @@ extern PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *);
/* Gets a version number unique to the current state of the keys of dict, if possible. /* Gets a version number unique to the current state of the keys of dict, if possible.
* Returns the version number, or zero if it was not possible to get a version number. */ * Returns the version number, or zero if it was not possible to get a version number. */
extern uint32_t _PyDictKeys_GetVersionForCurrentState(PyDictKeysObject *dictkeys); extern uint32_t _PyDictKeys_GetVersionForCurrentState(
PyInterpreterState *interp, PyDictKeysObject *dictkeys);
extern size_t _PyDict_KeysSize(PyDictKeysObject *keys); extern size_t _PyDict_KeysSize(PyDictKeysObject *keys);

4
Include/internal/pycore_dict_state.h
View file

@ -14,7 +14,6 @@ struct _Py_dict_runtime_state {
* It is incremented each time that a dictionary is created and each * It is incremented each time that a dictionary is created and each
* time that a dictionary is modified. */ * time that a dictionary is modified. */
uint64_t global_version; uint64_t global_version;
uint32_t next_keys_version;
}; };
@ -30,6 +29,8 @@ struct _Py_dict_runtime_state {
#define DICT_MAX_WATCHERS 8 #define DICT_MAX_WATCHERS 8
struct _Py_dict_state { struct _Py_dict_state {
uint32_t next_keys_version;
#if PyDict_MAXFREELIST > 0 #if PyDict_MAXFREELIST > 0
/* Dictionary reuse scheme to save calls to malloc and free */ /* Dictionary reuse scheme to save calls to malloc and free */
PyDictObject *free_list[PyDict_MAXFREELIST]; PyDictObject *free_list[PyDict_MAXFREELIST];
@ -37,6 +38,7 @@ struct _Py_dict_state {
int numfree; int numfree;
int keys_numfree; int keys_numfree;
#endif #endif
PyDict_WatchCallback watchers[DICT_MAX_WATCHERS]; PyDict_WatchCallback watchers[DICT_MAX_WATCHERS];
}; };

6
Include/internal/pycore_runtime_init.h
View file

@ -65,9 +65,6 @@ extern PyTypeObject _PyExc_MemoryError;
.float_format = _py_float_format_unknown, \ .float_format = _py_float_format_unknown, \
.double_format = _py_float_format_unknown, \ .double_format = _py_float_format_unknown, \
}, \ }, \
.dict_state = { \
.next_keys_version = 2, \
}, \
.types = { \ .types = { \
.next_version_tag = 1, \ .next_version_tag = 1, \
}, \ }, \
@ -113,6 +110,9 @@ extern PyTypeObject _PyExc_MemoryError;
}, \ }, \
}, \ }, \
.dtoa = _dtoa_state_INIT(&(INTERP)), \ .dtoa = _dtoa_state_INIT(&(INTERP)), \
.dict_state = { \
.next_keys_version = 2, \
}, \
.func_state = { \ .func_state = { \
.next_version = 1, \ .next_version = 1, \
}, \ }, \

7
Objects/dictobject.c
View file

@ -5655,15 +5655,16 @@ _PyDictKeys_DecRef(PyDictKeysObject *keys)
dictkeys_decref(keys); dictkeys_decref(keys);
} }
uint32_t _PyDictKeys_GetVersionForCurrentState(PyDictKeysObject *dictkeys) uint32_t _PyDictKeys_GetVersionForCurrentState(PyInterpreterState *interp,
PyDictKeysObject *dictkeys)
{ {
if (dictkeys->dk_version != 0) { if (dictkeys->dk_version != 0) {
return dictkeys->dk_version; return dictkeys->dk_version;
} }
if (_PyRuntime.dict_state.next_keys_version == 0) { if (interp->dict_state.next_keys_version == 0) {
return 0; return 0;
} }
uint32_t v = _PyRuntime.dict_state.next_keys_version++; uint32_t v = interp->dict_state.next_keys_version++;
dictkeys->dk_version = v; dictkeys->dk_version = v;
return v; return v;
} }

16
Python/specialize.c
View file

@ -512,7 +512,8 @@ specialize_module_load_attr(
SPEC_FAIL_OUT_OF_RANGE); SPEC_FAIL_OUT_OF_RANGE);
return -1; return -1;
} }
uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(dict->ma_keys); uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(
_PyInterpreterState_GET(), dict->ma_keys);
if (keys_version == 0) { if (keys_version == 0) {
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS); SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
return -1; return -1;
@ -1063,7 +1064,8 @@ PyObject *descr, DescriptorClassification kind)
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_SHADOWED); SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_SHADOWED);
return 0; return 0;
} }
uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(keys); uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(
_PyInterpreterState_GET(), keys);
if (keys_version == 0) { if (keys_version == 0) {
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS); SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_OUT_OF_VERSIONS);
return 0; return 0;
@ -1134,12 +1136,14 @@ _Py_Specialize_LoadGlobal(
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_EXPECTED_ERROR); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_EXPECTED_ERROR);
goto fail; goto fail;
} }
PyInterpreterState *interp = _PyInterpreterState_GET();
if (index != DKIX_EMPTY) { if (index != DKIX_EMPTY) {
if (index != (uint16_t)index) { if (index != (uint16_t)index) {
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_RANGE); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_RANGE);
goto fail; goto fail;
} }
uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(globals_keys); uint32_t keys_version = _PyDictKeys_GetVersionForCurrentState(
interp, globals_keys);
if (keys_version == 0) { if (keys_version == 0) {
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS);
goto fail; goto fail;
@ -1167,12 +1171,14 @@ _Py_Specialize_LoadGlobal(
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_RANGE); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_RANGE);
goto fail; goto fail;
} }
uint32_t globals_version = _PyDictKeys_GetVersionForCurrentState(globals_keys); uint32_t globals_version = _PyDictKeys_GetVersionForCurrentState(
interp, globals_keys);
if (globals_version == 0) { if (globals_version == 0) {
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS);
goto fail; goto fail;
} }
uint32_t builtins_version = _PyDictKeys_GetVersionForCurrentState(builtin_keys); uint32_t builtins_version = _PyDictKeys_GetVersionForCurrentState(
interp, builtin_keys);
if (builtins_version == 0) { if (builtins_version == 0) {
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS); SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_OUT_OF_VERSIONS);
goto fail; goto fail;