https://github.com/python/cpython/commit/699779256ec4d4b8afb8211de08ef1382c78c370
commit: 699779256ec4d4b8afb8211de08ef1382c78c370
branch: main
author: Donghee Na <[email protected]>
committer: corona10 <[email protected]>
date: 2024-01-27T00:25:16+09:00
summary:
gh-111968: Unify freelist naming schema to Eric's suggestion (gh-114581)
files:
M Include/internal/pycore_freelist.h
M Objects/floatobject.c
M Objects/genobject.c
M Objects/listobject.c
M Objects/sliceobject.c
M Objects/tupleobject.c
M Python/context.c
M Python/object_stack.c
diff --git a/Include/internal/pycore_freelist.h
b/Include/internal/pycore_freelist.h
index dfb12839affedf..b91d2bc066b783 100644
--- a/Include/internal/pycore_freelist.h
+++ b/Include/internal/pycore_freelist.h
@@ -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
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index 912c450a5e1055..b7611d5f96ac3b 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -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);
diff --git a/Objects/genobject.c b/Objects/genobject.c
index e9aeb7ab9a9fa8..f47197330fdd80 100644
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -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;
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 401d1026133f4e..1e885f9cb80c4c 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -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));
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 440c1da30620c3..8b9d6bbfd858b7 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -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
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index e1b8e4004c6163..b9bf6cd48f6129 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -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 *
diff --git a/Python/context.c b/Python/context.c
index 1e90811c374ec6..294485e5b407df 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -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;
diff --git a/Python/object_stack.c b/Python/object_stack.c
index 66b37bcbb44475..8544892eb71dcb 100644
--- a/Python/object_stack.c
+++ b/Python/object_stack.c
@@ -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;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
