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

gh-111968: Unify freelist naming schema to Eric's suggestion (gh-114581)

This commit is contained in:
Donghee Na 2024-01-27 00:25:16 +09:00 committed by GitHub
parent 504334c7be
commit 699779256e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Include/internal/pycore_freelist.h
View File

@ -103,13 +103,13 @@ struct _Py_object_stack_state {
};
typedef struct _Py_freelist_state {
struct _Py_float_state float_state;
struct _Py_tuple_state tuple_state;
struct _Py_list_state list_state;
struct _Py_slice_state slice_state;
struct _Py_context_state context_state;
struct _Py_async_gen_state async_gen_state;
struct _Py_object_stack_state object_stack_state;
struct _Py_float_state floats;
struct _Py_tuple_state tuples;
struct _Py_list_state lists;
struct _Py_slice_state slices;
struct _Py_context_state contexts;
struct _Py_async_gen_state async_gens;
struct _Py_object_stack_state object_stacks;
} _PyFreeListState;
#ifdef __cplusplus

4
Objects/floatobject.c
View File

@ -32,7 +32,7 @@ get_float_state(void)
{
_PyFreeListState *state = _PyFreeListState_GET();
assert(state != NULL);
return &state->float_state;
return &state->floats;
}
#endif
@ -1993,7 +1993,7 @@ void
_PyFloat_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization)
{
#ifdef WITH_FREELISTS
struct _Py_float_state *state = &freelist_state->float_state;
struct _Py_float_state *state = &freelist_state->floats;
PyFloatObject *f = state->free_list;
while (f != NULL) {
PyFloatObject *next = (PyFloatObject*) Py_TYPE(f);

4
Objects/genobject.c
View File

@ -1633,7 +1633,7 @@ static struct _Py_async_gen_state *
get_async_gen_state(void)
{
_PyFreeListState *state = _PyFreeListState_GET();
return &state->async_gen_state;
return &state->async_gens;
}
#endif
@ -1659,7 +1659,7 @@ void
_PyAsyncGen_ClearFreeLists(_PyFreeListState *freelist_state, int is_finalization)
{
#ifdef WITH_FREELISTS
struct _Py_async_gen_state *state = &freelist_state->async_gen_state;
struct _Py_async_gen_state *state = &freelist_state->async_gens;
while (state->value_numfree > 0) {
_PyAsyncGenWrappedValue *o;

4
Objects/listobject.c
View File

@ -26,7 +26,7 @@ get_list_state(void)
{
_PyFreeListState *state = _PyFreeListState_GET();
assert(state != NULL);
return &state->list_state;
return &state->lists;
}
#endif
@ -124,7 +124,7 @@ void
_PyList_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization)
{
#ifdef WITH_FREELISTS
struct _Py_list_state *state = &freelist_state->list_state;
struct _Py_list_state *state = &freelist_state->lists;
while (state->numfree > 0) {
PyListObject *op = state->free_list[--state->numfree];
assert(PyList_CheckExact(op));

14
Objects/sliceobject.c
View File

@ -106,9 +106,9 @@ PyObject _Py_EllipsisObject = _PyObject_HEAD_INIT(&PyEllipsis_Type);
void _PySlice_ClearCache(_PyFreeListState *state)
{
#ifdef WITH_FREELISTS
PySliceObject *obj = state->slice_state.slice_cache;
PySliceObject *obj = state->slices.slice_cache;
if (obj != NULL) {
state->slice_state.slice_cache = NULL;
state->slices.slice_cache = NULL;
PyObject_GC_Del(obj);
}
#endif
@ -132,9 +132,9 @@ _PyBuildSlice_Consume2(PyObject *start, PyObject *stop, PyObject *step)
PySliceObject *obj;
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache != NULL) {
obj = state->slice_state.slice_cache;
state->slice_state.slice_cache = NULL;
if (state->slices.slice_cache != NULL) {
obj = state->slices.slice_cache;
state->slices.slice_cache = NULL;
_Py_NewReference((PyObject *)obj);
}
else
@ -370,8 +370,8 @@ slice_dealloc(PySliceObject *r)
Py_DECREF(r->stop);
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache == NULL) {
state->slice_state.slice_cache = r;
if (state->slices.slice_cache == NULL) {
state->slices.slice_cache = r;
}
else
#endif

2
Objects/tupleobject.c
View File

@ -1125,7 +1125,7 @@ tuple_iter(PyObject *seq)
* freelists *
*************/
#define STATE (state->tuple_state)
#define STATE (state->tuples)
#define FREELIST_FINALIZED (STATE.numfree[0] < 0)
static inline PyTupleObject *

4
Python/context.c
View File

@ -69,7 +69,7 @@ static struct _Py_context_state *
get_context_state(void)
{
_PyFreeListState *state = _PyFreeListState_GET();
return &state->context_state;
return &state->contexts;
}
#endif
@ -1270,7 +1270,7 @@ void
_PyContext_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization)
{
#ifdef WITH_FREELISTS
struct _Py_context_state *state = &freelist_state->context_state;
struct _Py_context_state *state = &freelist_state->contexts;
for (; state->numfree > 0; state->numfree--) {
PyContext *ctx = state->freelist;
state->freelist = (PyContext *)ctx->ctx_weakreflist;

4
Python/object_stack.c
View File

@ -12,7 +12,7 @@ static struct _Py_object_stack_state *
get_state(void)
{
_PyFreeListState *state = _PyFreeListState_GET();
return &state->object_stack_state;
return &state->object_stacks;
}
_PyObjectStackChunk *
@ -76,7 +76,7 @@ _PyObjectStackChunk_ClearFreeList(_PyFreeListState *free_lists, int is_finalizat
return;
}
struct _Py_object_stack_state *state = &free_lists->object_stack_state;
struct _Py_object_stack_state *state = &free_lists->object_stacks;
while (state->numfree > 0) {
_PyObjectStackChunk *buf = state->free_list;
state->free_list = buf->prev;