Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-111968: Explicit handling for finalized freelist (gh-113929)

This commit is contained in:
Donghee Na 2024-01-12 09:31:28 +09:00 committed by GitHub
parent 53d2e1f26c
commit efa738e862
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Objects/floatobject.c
View File

@ -132,10 +132,6 @@ PyFloat_FromDouble(double fval)
struct _Py_float_state *state = get_float_state(); struct _Py_float_state *state = get_float_state();
op = state->free_list; op = state->free_list;
if (op != NULL) { if (op != NULL) {
#ifdef Py_DEBUG
// PyFloat_FromDouble() must not be called after _PyFloat_Fini()
assert(state->numfree != -1);
#endif
state->free_list = (PyFloatObject *) Py_TYPE(op); state->free_list = (PyFloatObject *) Py_TYPE(op);
state->numfree--; state->numfree--;
OBJECT_STAT_INC(from_freelist); OBJECT_STAT_INC(from_freelist);

22
Objects/listobject.c
View File

@ -20,7 +20,7 @@ class list "PyListObject *" "&PyList_Type"
_Py_DECLARE_STR(list_err, "list index out of range"); _Py_DECLARE_STR(list_err, "list index out of range");
#if PyList_MAXFREELIST > 0 #ifdef WITH_FREELISTS
static struct _Py_list_state * static struct _Py_list_state *
get_list_state(void) get_list_state(void)
{ {
@ -123,7 +123,7 @@ list_preallocate_exact(PyListObject *self, Py_ssize_t size)
void void
_PyList_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization) _PyList_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization)
{ {
#if PyList_MAXFREELIST > 0 #ifdef WITH_FREELISTS
struct _Py_list_state *state = &freelist_state->list_state; struct _Py_list_state *state = &freelist_state->list_state;
while (state->numfree > 0) { while (state->numfree > 0) {
PyListObject *op = state->free_list[--state->numfree]; PyListObject *op = state->free_list[--state->numfree];
@ -146,7 +146,7 @@ _PyList_Fini(_PyFreeListState *state)
void void
_PyList_DebugMallocStats(FILE *out) _PyList_DebugMallocStats(FILE *out)
{ {
#if PyList_MAXFREELIST > 0 #ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state(); struct _Py_list_state *state = get_list_state();
_PyDebugAllocatorStats(out, _PyDebugAllocatorStats(out,
"free PyListObject", "free PyListObject",
@ -164,13 +164,9 @@ PyList_New(Py_ssize_t size)
return NULL; return NULL;
} }
#if PyList_MAXFREELIST > 0 #ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state(); struct _Py_list_state *state = get_list_state();
#ifdef Py_DEBUG if (PyList_MAXFREELIST && state->numfree > 0) {
// PyList_New() must not be called after _PyList_Fini()
assert(state->numfree != -1);
#endif
if (PyList_MAXFREELIST && state->numfree) {
state->numfree--; state->numfree--;
op = state->free_list[state->numfree]; op = state->free_list[state->numfree];
OBJECT_STAT_INC(from_freelist); OBJECT_STAT_INC(from_freelist);
@ -360,13 +356,9 @@ list_dealloc(PyObject *self)
} }
PyMem_Free(op->ob_item); PyMem_Free(op->ob_item);
} }
#if PyList_MAXFREELIST > 0 #ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state(); struct _Py_list_state *state = get_list_state();
#ifdef Py_DEBUG if (state->numfree < PyList_MAXFREELIST && state->numfree >= 0 && PyList_CheckExact(op)) {
// list_dealloc() must not be called after _PyList_Fini()
assert(state->numfree != -1);
#endif
if (state->numfree < PyList_MAXFREELIST && PyList_CheckExact(op)) {
state->free_list[state->numfree++] = op; state->free_list[state->numfree++] = op;
OBJECT_STAT_INC(to_freelist); OBJECT_STAT_INC(to_freelist);
} }