Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-111968: Split _Py_async_gen_asend_freelist out of _Py_async_gen_fr… #115546

Merged
merged 2 commits into from
Feb 17, 2024
Merged

gh-111968: Split _Py_async_gen_asend_freelist out of _Py_async_gen_fr… #115546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc00ea6
gh-111968: Split _Py_async_gen_asend_freelist out of _Py_async_gen_fr…
corona10 Feb 16, 2024
825c29f
fix
corona10 Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions Include/internal/pycore_freelist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,15 @@ struct _Py_async_gen_freelist {
fragmentation, as _PyAsyncGenWrappedValue and PyAsyncGenASend
are short-living objects that are instantiated for every
__anext__() call. */
struct _PyAsyncGenWrappedValue* value_freelist[_PyAsyncGen_MAXFREELIST];
int value_numfree;
struct _PyAsyncGenWrappedValue* items[_PyAsyncGen_MAXFREELIST];
int numfree;
#endif
};

struct PyAsyncGenASend* asend_freelist[_PyAsyncGen_MAXFREELIST];
int asend_numfree;
struct _Py_async_gen_asend_freelist {
#ifdef WITH_FREELISTS
struct PyAsyncGenASend* items[_PyAsyncGen_MAXFREELIST];
int numfree;
#endif
};

Expand All @@ -129,6 +133,7 @@ struct _Py_object_freelists {
struct _Py_slice_freelist slices;
struct _Py_context_freelist contexts;
struct _Py_async_gen_freelist async_gens;
struct _Py_async_gen_asend_freelist async_gen_asends;
struct _Py_object_stack_freelist object_stacks;
};

Expand Down
51 changes: 30 additions & 21 deletions Objects/genobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,13 @@ get_async_gen_freelist(void)
struct _Py_object_freelists *freelists = _Py_object_freelists_GET();
return &freelists->async_gens;
}

static struct _Py_async_gen_asend_freelist *
get_async_gen_asend_freelist(void)
{
struct _Py_object_freelists *freelists = _Py_object_freelists_GET();
return &freelists->async_gen_asends;
}
#endif


Expand All @@ -1659,25 +1666,27 @@ void
_PyAsyncGen_ClearFreeLists(struct _Py_object_freelists *freelist_state, int is_finalization)
{
#ifdef WITH_FREELISTS
struct _Py_async_gen_freelist *state = &freelist_state->async_gens;
struct _Py_async_gen_freelist *freelist = &freelist_state->async_gens;

while (state->value_numfree > 0) {
while (freelist->numfree > 0) {
_PyAsyncGenWrappedValue *o;
o = state->value_freelist[--state->value_numfree];
o = freelist->items[--freelist->numfree];
assert(_PyAsyncGenWrappedValue_CheckExact(o));
PyObject_GC_Del(o);
}

while (state->asend_numfree > 0) {
struct _Py_async_gen_asend_freelist *asend_freelist = &freelist_state->async_gen_asends;

while (asend_freelist->numfree > 0) {
PyAsyncGenASend *o;
o = state->asend_freelist[--state->asend_numfree];
o = asend_freelist->items[--asend_freelist->numfree];
assert(Py_IS_TYPE(o, &_PyAsyncGenASend_Type));
PyObject_GC_Del(o);
}

if (is_finalization) {
state->value_numfree = -1;
state->asend_numfree = -1;
freelist->numfree = -1;
asend_freelist->numfree = -1;
}
#endif
}
Expand Down Expand Up @@ -1726,11 +1735,11 @@ async_gen_asend_dealloc(PyAsyncGenASend *o)
Py_CLEAR(o->ags_gen);
Py_CLEAR(o->ags_sendval);
#ifdef WITH_FREELISTS
struct _Py_async_gen_freelist *async_gen_freelist = get_async_gen_freelist();
if (async_gen_freelist->asend_numfree >= 0 && async_gen_freelist->asend_numfree < _PyAsyncGen_MAXFREELIST) {
struct _Py_async_gen_asend_freelist *freelist = get_async_gen_asend_freelist();
if (freelist->numfree >= 0 && freelist->numfree < _PyAsyncGen_MAXFREELIST) {
assert(PyAsyncGenASend_CheckExact(o));
_PyGC_CLEAR_FINALIZED((PyObject *)o);
async_gen_freelist->asend_freelist[async_gen_freelist->asend_numfree++] = o;
freelist->items[freelist->numfree++] = o;
}
else
#endif
Expand Down Expand Up @@ -1896,10 +1905,10 @@ async_gen_asend_new(PyAsyncGenObject *gen, PyObject *sendval)
{
PyAsyncGenASend *o;
#ifdef WITH_FREELISTS
struct _Py_async_gen_freelist *async_gen_freelist = get_async_gen_freelist();
if (async_gen_freelist->asend_numfree > 0) {
async_gen_freelist->asend_numfree--;
o = async_gen_freelist->asend_freelist[async_gen_freelist->asend_numfree];
struct _Py_async_gen_asend_freelist *freelist = get_async_gen_asend_freelist();
if (freelist->numfree > 0) {
freelist->numfree--;
o = freelist->items[freelist->numfree];
_Py_NewReference((PyObject *)o);
}
else
Expand Down Expand Up @@ -1931,10 +1940,10 @@ async_gen_wrapped_val_dealloc(_PyAsyncGenWrappedValue *o)
_PyObject_GC_UNTRACK((PyObject *)o);
Py_CLEAR(o->agw_val);
#ifdef WITH_FREELISTS
struct _Py_async_gen_freelist *async_gen_freelist = get_async_gen_freelist();
if (async_gen_freelist->value_numfree >= 0 && async_gen_freelist->value_numfree < _PyAsyncGen_MAXFREELIST) {
struct _Py_async_gen_freelist *freelist = get_async_gen_freelist();
if (freelist->numfree >= 0 && freelist->numfree < _PyAsyncGen_MAXFREELIST) {
assert(_PyAsyncGenWrappedValue_CheckExact(o));
async_gen_freelist->value_freelist[async_gen_freelist->value_numfree++] = o;
freelist->items[freelist->numfree++] = o;
OBJECT_STAT_INC(to_freelist);
}
else
Expand Down Expand Up @@ -2004,10 +2013,10 @@ _PyAsyncGenValueWrapperNew(PyThreadState *tstate, PyObject *val)
assert(val);

#ifdef WITH_FREELISTS
struct _Py_async_gen_freelist *async_gen_freelist = get_async_gen_freelist();
if (async_gen_freelist->value_numfree > 0) {
async_gen_freelist->value_numfree--;
o = async_gen_freelist->value_freelist[async_gen_freelist->value_numfree];
struct _Py_async_gen_freelist *freelist = get_async_gen_freelist();
if (freelist->numfree > 0) {
freelist->numfree--;
o = freelist->items[freelist->numfree];
OBJECT_STAT_INC(from_freelist);
assert(_PyAsyncGenWrappedValue_CheckExact(o));
_Py_NewReference((PyObject*)o);
Expand Down
Loading