mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-40521: Make dict free lists per-interpreter (GH-20645)

Browse source 
Each interpreter now has its own dict free list:

* Move dict free lists into PyInterpreterState.
* Move PyDict_MAXFREELIST define to pycore_interp.h
* Add _Py_dict_state structure.
* Add tstate parameter to _PyDict_ClearFreeList() and _PyDict_Fini().
* In debug mode, ensure that the dict free lists are not used after
  _PyDict_Fini() is called.
* Remove "#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS".
This commit is contained in:
Victor Stinner 2020-06-23 11:33:18 +02:00 • committed by GitHub
parent 26a1ad1c24
commit b4e85cadfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 102 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/internal/pycore_gc.h
View file

@ -169,7 +169,7 @@ extern void _PyFrame_ClearFreeList(PyThreadState *tstate);
extern void _PyTuple_ClearFreeList(PyThreadState *tstate); extern void _PyTuple_ClearFreeList(PyThreadState *tstate);
extern void _PyFloat_ClearFreeList(PyThreadState *tstate); extern void _PyFloat_ClearFreeList(PyThreadState *tstate);
extern void _PyList_ClearFreeList(PyThreadState *tstate); extern void _PyList_ClearFreeList(PyThreadState *tstate);
extern void _PyDict_ClearFreeList(void); extern void _PyDict_ClearFreeList(PyThreadState *tstate);
extern void _PyAsyncGen_ClearFreeLists(PyThreadState *tstate); extern void _PyAsyncGen_ClearFreeLists(PyThreadState *tstate);
extern void _PyContext_ClearFreeList(PyThreadState *tstate); extern void _PyContext_ClearFreeList(PyThreadState *tstate);

39
Include/internal/pycore_interp.h
View file

@ -69,6 +69,14 @@ struct _Py_unicode_state {
struct _Py_unicode_fs_codec fs_codec; struct _Py_unicode_fs_codec fs_codec;
}; };
struct _Py_float_state {
/* Special free list
free_list is a singly-linked list of available PyFloatObjects,
linked via abuse of their ob_type members. */
int numfree;
PyFloatObject *free_list;
};
/* Speed optimization to avoid frequent malloc/free of small tuples */ /* Speed optimization to avoid frequent malloc/free of small tuples */
#ifndef PyTuple_MAXSAVESIZE #ifndef PyTuple_MAXSAVESIZE
// Largest tuple to save on free list // Largest tuple to save on free list
@ -99,12 +107,16 @@ struct _Py_list_state {
int numfree; int numfree;
}; };
struct _Py_float_state { #ifndef PyDict_MAXFREELIST
/* Special free list # define PyDict_MAXFREELIST 80
free_list is a singly-linked list of available PyFloatObjects, #endif
linked via abuse of their ob_type members. */
struct _Py_dict_state {
/* Dictionary reuse scheme to save calls to malloc and free */
PyDictObject *free_list[PyDict_MAXFREELIST];
int numfree; int numfree;
PyFloatObject *free_list; PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST];
int keys_numfree;
}; };
struct _Py_frame_state { struct _Py_frame_state {
@ -136,7 +148,6 @@ struct _Py_context_state {
}; };
/* interpreter state */ /* interpreter state */
#define _PY_NSMALLPOSINTS 257 #define _PY_NSMALLPOSINTS 257
@ -182,8 +193,6 @@ struct _is {
PyObject *codec_error_registry; PyObject *codec_error_registry;
int codecs_initialized; int codecs_initialized;
struct _Py_unicode_state unicode;
PyConfig config; PyConfig config;
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
int dlopenflags; int dlopenflags;
@ -224,16 +233,18 @@ struct _is {
*/ */
PyLongObject* small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS]; PyLongObject* small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS];
#endif #endif
struct _Py_tuple_state tuple; struct _Py_unicode_state unicode;
struct _Py_list_state list;
struct _Py_float_state float_state; struct _Py_float_state float_state;
struct _Py_frame_state frame;
struct _Py_async_gen_state async_gen;
struct _Py_context_state context;
/* Using a cache is very effective since typically only a single slice is /* Using a cache is very effective since typically only a single slice is
created and then deleted again. */ created and then deleted again. */
PySliceObject *slice_cache; PySliceObject *slice_cache;
struct _Py_tuple_state tuple;
struct _Py_list_state list;
struct _Py_dict_state dict_state;
struct _Py_frame_state frame;
struct _Py_async_gen_state async_gen;
struct _Py_context_state context;
}; };
/* Used by _PyImport_Cleanup() */ /* Used by _PyImport_Cleanup() */

2
Include/internal/pycore_pylifecycle.h
View file

@ -59,7 +59,7 @@ extern PyStatus _PyGC_Init(PyThreadState *tstate);
/* Various internal finalizers */ /* Various internal finalizers */
extern void _PyFrame_Fini(PyThreadState *tstate); extern void _PyFrame_Fini(PyThreadState *tstate);
extern void _PyDict_Fini(void); extern void _PyDict_Fini(PyThreadState *tstate);
extern void _PyTuple_Fini(PyThreadState *tstate); extern void _PyTuple_Fini(PyThreadState *tstate);
extern void _PyList_Fini(PyThreadState *tstate); extern void _PyList_Fini(PyThreadState *tstate);
extern void _PySet_Fini(void); extern void _PySet_Fini(void);

7
Misc/NEWS.d/next/Core and Builtins/2020-05-20-01-17-34.bpo-40521.wvAehI.rst
View file

@ -1,4 +1,5 @@
The tuple free lists, the empty tuple singleton, the list free list, the float The tuple free lists, the empty tuple singleton, the list free list, the float
free list, the slice cache, the frame free list, the asynchronous generator free list, the slice cache, the dict free lists, the frame free list, the
free lists, and the context free list are no longer shared by all interpreters: asynchronous generator free lists, and the context free list are no longer
each interpreter now its has own free lists and caches. shared by all interpreters: each interpreter now its has own free lists and
caches.

2
Modules/gcmodule.c
View file

@ -1038,7 +1038,7 @@ clear_freelists(PyThreadState *tstate)
_PyTuple_ClearFreeList(tstate); _PyTuple_ClearFreeList(tstate);
_PyFloat_ClearFreeList(tstate); _PyFloat_ClearFreeList(tstate);
_PyList_ClearFreeList(tstate); _PyList_ClearFreeList(tstate);
_PyDict_ClearFreeList(); _PyDict_ClearFreeList(tstate);
_PyAsyncGen_ClearFreeLists(tstate); _PyAsyncGen_ClearFreeLists(tstate);
_PyContext_ClearFreeList(tstate); _PyContext_ClearFreeList(tstate);
} }

131
Objects/dictobject.c
View file

@ -247,58 +247,47 @@ static uint64_t pydict_global_version = 0;
#define DICT_NEXT_VERSION() (++pydict_global_version) #define DICT_NEXT_VERSION() (++pydict_global_version)
/* Dictionary reuse scheme to save calls to malloc and free */
#ifndef PyDict_MAXFREELIST
#define PyDict_MAXFREELIST 80
#endif
/* bpo-40521: dict free lists are shared by all interpreters. */
#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS
# undef PyDict_MAXFREELIST
# define PyDict_MAXFREELIST 0
#endif
#if PyDict_MAXFREELIST > 0
static PyDictObject *free_list[PyDict_MAXFREELIST];
static int numfree = 0;
static PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST];
static int numfreekeys = 0;
#endif
#include "clinic/dictobject.c.h" #include "clinic/dictobject.c.h"
void void
_PyDict_ClearFreeList(void) _PyDict_ClearFreeList(PyThreadState *tstate)
{ {
#if PyDict_MAXFREELIST > 0 struct _Py_dict_state *state = &tstate->interp->dict_state;
while (numfree) { while (state->numfree) {
PyDictObject *op = free_list[--numfree]; PyDictObject *op = state->free_list[--state->numfree];
assert(PyDict_CheckExact(op)); assert(PyDict_CheckExact(op));
PyObject_GC_Del(op); PyObject_GC_Del(op);
} }
while (numfreekeys) { while (state->keys_numfree) {
PyObject_FREE(keys_free_list[--numfreekeys]); PyObject_FREE(state->keys_free_list[--state->keys_numfree]);
} }
}
void
_PyDict_Fini(PyThreadState *tstate)
{
_PyDict_ClearFreeList(tstate);
#ifdef Py_DEBUG
PyInterpreterState *interp = _PyInterpreterState_GET();
struct _Py_dict_state *state = &interp->dict_state;
state->numfree = -1;
state->keys_numfree = -1;
#endif #endif
} }
/* Print summary info about the state of the optimized allocator */ /* Print summary info about the state of the optimized allocator */
void void
_PyDict_DebugMallocStats(FILE *out) _PyDict_DebugMallocStats(FILE *out)
{ {
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
_PyDebugAllocatorStats(out, struct _Py_dict_state *state = &interp->dict_state;
"free PyDictObject", numfree, sizeof(PyDictObject)); _PyDebugAllocatorStats(out, "free PyDictObject",
#endif state->numfree, sizeof(PyDictObject));
} }
void
_PyDict_Fini(void)
{
_PyDict_ClearFreeList();
}
#define DK_SIZE(dk) ((dk)->dk_size) #define DK_SIZE(dk) ((dk)->dk_size)
#if SIZEOF_VOID_P > 4 #if SIZEOF_VOID_P > 4
#define DK_IXSIZE(dk) \ #define DK_IXSIZE(dk) \
@ -543,7 +532,8 @@ _PyDict_CheckConsistency(PyObject *op, int check_content)
} }
static PyDictKeysObject *new_keys_object(Py_ssize_t size) static PyDictKeysObject*
new_keys_object(Py_ssize_t size)
{ {
PyDictKeysObject *dk; PyDictKeysObject *dk;
Py_ssize_t es, usable; Py_ssize_t es, usable;
@ -567,12 +557,16 @@ static PyDictKeysObject *new_keys_object(Py_ssize_t size)
es = sizeof(Py_ssize_t); es = sizeof(Py_ssize_t);
} }
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
if (size == PyDict_MINSIZE && numfreekeys > 0) { struct _Py_dict_state *state = &interp->dict_state;
dk = keys_free_list[--numfreekeys]; #ifdef Py_DEBUG
// new_keys_object() must not be called after _PyDict_Fini()
assert(state->keys_numfree != -1);
#endif
if (size == PyDict_MINSIZE && state->keys_numfree > 0) {
dk = state->keys_free_list[--state->keys_numfree];
} }
else else
#endif
{ {
dk = PyObject_MALLOC(sizeof(PyDictKeysObject) dk = PyObject_MALLOC(sizeof(PyDictKeysObject)
+ es * size + es * size
@ -604,12 +598,16 @@ free_keys_object(PyDictKeysObject *keys)
Py_XDECREF(entries[i].me_key); Py_XDECREF(entries[i].me_key);
Py_XDECREF(entries[i].me_value); Py_XDECREF(entries[i].me_value);
} }
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
if (keys->dk_size == PyDict_MINSIZE && numfreekeys < PyDict_MAXFREELIST) { struct _Py_dict_state *state = &interp->dict_state;
keys_free_list[numfreekeys++] = keys; #ifdef Py_DEBUG
// free_keys_object() must not be called after _PyDict_Fini()
assert(state->keys_numfree != -1);
#endif
if (keys->dk_size == PyDict_MINSIZE && state->keys_numfree < PyDict_MAXFREELIST) {
state->keys_free_list[state->keys_numfree++] = keys;
return; return;
} }
#endif
PyObject_FREE(keys); PyObject_FREE(keys);
} }
@ -622,16 +620,19 @@ new_dict(PyDictKeysObject *keys, PyObject **values)
{ {
PyDictObject *mp; PyDictObject *mp;
assert(keys != NULL); assert(keys != NULL);
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
if (numfree) { struct _Py_dict_state *state = &interp->dict_state;
mp = free_list[--numfree]; #ifdef Py_DEBUG
// new_dict() must not be called after _PyDict_Fini()
assert(state->numfree != -1);
#endif
if (state->numfree) {
mp = state->free_list[--state->numfree];
assert (mp != NULL); assert (mp != NULL);
assert (Py_IS_TYPE(mp, &PyDict_Type)); assert (Py_IS_TYPE(mp, &PyDict_Type));
_Py_NewReference((PyObject *)mp); _Py_NewReference((PyObject *)mp);
} }
else else {
#endif
{
mp = PyObject_GC_New(PyDictObject, &PyDict_Type); mp = PyObject_GC_New(PyDictObject, &PyDict_Type);
if (mp == NULL) { if (mp == NULL) {
dictkeys_decref(keys); dictkeys_decref(keys);
@ -1280,15 +1281,18 @@ dictresize(PyDictObject *mp, Py_ssize_t minsize)
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
_Py_RefTotal--; _Py_RefTotal--;
#endif #endif
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
if (oldkeys->dk_size == PyDict_MINSIZE && struct _Py_dict_state *state = &interp->dict_state;
numfreekeys < PyDict_MAXFREELIST) #ifdef Py_DEBUG
{ // dictresize() must not be called after _PyDict_Fini()
keys_free_list[numfreekeys++] = oldkeys; assert(state->keys_numfree != -1);
}
else
#endif #endif
if (oldkeys->dk_size == PyDict_MINSIZE &&
state->keys_numfree < PyDict_MAXFREELIST)
{ {
state->keys_free_list[state->keys_numfree++] = oldkeys;
}
else {
PyObject_FREE(oldkeys); PyObject_FREE(oldkeys);
} }
} }
@ -2028,13 +2032,16 @@ dict_dealloc(PyDictObject *mp)
assert(keys->dk_refcnt == 1); assert(keys->dk_refcnt == 1);
dictkeys_decref(keys); dictkeys_decref(keys);
} }
#if PyDict_MAXFREELIST > 0 PyInterpreterState *interp = _PyInterpreterState_GET();
if (numfree < PyDict_MAXFREELIST && Py_IS_TYPE(mp, &PyDict_Type)) { struct _Py_dict_state *state = &interp->dict_state;
free_list[numfree++] = mp; #ifdef Py_DEBUG
} // new_dict() must not be called after _PyDict_Fini()
else assert(state->numfree != -1);
#endif #endif
{ if (state->numfree < PyDict_MAXFREELIST && Py_IS_TYPE(mp, &PyDict_Type)) {
state->free_list[state->numfree++] = mp;
}
else {
Py_TYPE(mp)->tp_free((PyObject *)mp); Py_TYPE(mp)->tp_free((PyObject *)mp);
} }
Py_TRASHCAN_END Py_TRASHCAN_END

4
Python/pylifecycle.c
View file

@ -1258,9 +1258,7 @@ finalize_interp_types(PyThreadState *tstate, int is_main_interp)
if (is_main_interp) { if (is_main_interp) {
_PySet_Fini(); _PySet_Fini();
} }
if (is_main_interp) { _PyDict_Fini(tstate);
_PyDict_Fini();
}
_PyList_Fini(tstate); _PyList_Fini(tstate);
_PyTuple_Fini(tstate); _PyTuple_Fini(tstate);