mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
gh-124218: Use per-thread reference counting for globals and builtins (#125713)
Use per-thread refcounting for the reference from function objects to the globals and builtins dictionaries.
This commit is contained in:
parent
d880c83ff7
commit
9b0bfba2a2
8 changed files with 115 additions and 11 deletions
|
@ -17,7 +17,9 @@ typedef struct {
|
|||
/* This is a private field for CPython's internal use.
|
||||
* Bits 0-7 are for dict watchers.
|
||||
* Bits 8-11 are for the watched mutation counter (used by tier2 optimization)
|
||||
* The remaining bits are not currently used. */
|
||||
* Bits 12-31 are currently unused
|
||||
* Bits 32-63 are a unique id in the free threading build (used for per-thread refcounting)
|
||||
*/
|
||||
uint64_t _ma_watcher_tag;
|
||||
|
||||
PyDictKeysObject *ma_keys;
|
||||
|
|
|
@ -229,6 +229,8 @@ static inline PyDictUnicodeEntry* DK_UNICODE_ENTRIES(PyDictKeysObject *dk) {
|
|||
#define DICT_VERSION_INCREMENT (1 << (DICT_MAX_WATCHERS + DICT_WATCHED_MUTATION_BITS))
|
||||
#define DICT_WATCHER_MASK ((1 << DICT_MAX_WATCHERS) - 1)
|
||||
#define DICT_WATCHER_AND_MODIFICATION_MASK ((1 << (DICT_MAX_WATCHERS + DICT_WATCHED_MUTATION_BITS)) - 1)
|
||||
#define DICT_UNIQUE_ID_SHIFT (32)
|
||||
#define DICT_UNIQUE_ID_MAX ((UINT64_C(1) << (64 - DICT_UNIQUE_ID_SHIFT)) - 1)
|
||||
|
||||
|
||||
PyAPI_FUNC(void)
|
||||
|
@ -307,8 +309,40 @@ _PyInlineValuesSize(PyTypeObject *tp)
|
|||
int
|
||||
_PyDict_DetachFromObject(PyDictObject *dict, PyObject *obj);
|
||||
|
||||
// Enables per-thread ref counting on this dict in the free threading build
|
||||
extern void _PyDict_EnablePerThreadRefcounting(PyObject *op);
|
||||
|
||||
PyDictObject *_PyObject_MaterializeManagedDict_LockHeld(PyObject *);
|
||||
|
||||
// See `_Py_INCREF_TYPE()` in pycore_object.h
|
||||
#ifndef Py_GIL_DISABLED
|
||||
# define _Py_INCREF_DICT Py_INCREF
|
||||
# define _Py_DECREF_DICT Py_DECREF
|
||||
#else
|
||||
static inline Py_ssize_t
|
||||
_PyDict_UniqueId(PyDictObject *mp)
|
||||
{
|
||||
// Offset by one so that _ma_watcher_tag=0 represents an unassigned id
|
||||
return (Py_ssize_t)(mp->_ma_watcher_tag >> DICT_UNIQUE_ID_SHIFT) - 1;
|
||||
}
|
||||
|
||||
static inline void
|
||||
_Py_INCREF_DICT(PyObject *op)
|
||||
{
|
||||
assert(PyDict_Check(op));
|
||||
Py_ssize_t id = _PyDict_UniqueId((PyDictObject *)op);
|
||||
_Py_THREAD_INCREF_OBJECT(op, id);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_Py_DECREF_DICT(PyObject *op)
|
||||
{
|
||||
assert(PyDict_Check(op));
|
||||
Py_ssize_t id = _PyDict_UniqueId((PyDictObject *)op);
|
||||
_Py_THREAD_DECREF_OBJECT(op, id);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -293,6 +293,20 @@ extern PyStatus _PyObject_InitState(PyInterpreterState *interp);
|
|||
extern void _PyObject_FiniState(PyInterpreterState *interp);
|
||||
extern bool _PyRefchain_IsTraced(PyInterpreterState *interp, PyObject *obj);
|
||||
|
||||
// Macros used for per-thread reference counting in the free threading build.
|
||||
// They resolve to normal Py_INCREF/DECREF calls in the default build.
|
||||
//
|
||||
// The macros are used for only a few references that would otherwise cause
|
||||
// scaling bottlenecks in the free threading build:
|
||||
// - The reference from an object to `ob_type`.
|
||||
// - The reference from a function to `func_code`.
|
||||
// - The reference from a function to `func_globals` and `func_builtins`.
|
||||
//
|
||||
// It's safe, but not performant or necessary, to use these macros for other
|
||||
// references to code, type, or dict objects. It's also safe to mix their
|
||||
// usage with normal Py_INCREF/DECREF calls.
|
||||
//
|
||||
// See also Include/internal/pycore_dict.h for _Py_INCREF_DICT/_Py_DECREF_DICT.
|
||||
#ifndef Py_GIL_DISABLED
|
||||
# define _Py_INCREF_TYPE Py_INCREF
|
||||
# define _Py_DECREF_TYPE Py_DECREF
|
||||
|
|
|
@ -48,6 +48,9 @@ struct _Py_unique_id_pool {
|
|||
// Assigns the next id from the pool of ids.
|
||||
extern Py_ssize_t _PyObject_AssignUniqueId(PyObject *obj);
|
||||
|
||||
// Releases the allocated id back to the pool.
|
||||
extern void _PyObject_ReleaseUniqueId(Py_ssize_t unique_id);
|
||||
|
||||
// Releases the allocated id back to the pool.
|
||||
extern void _PyObject_DisablePerThreadRefcounting(PyObject *obj);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue