Skip to content

gh-126703: add freelist for PyComplexObject's #135233

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

Merged
corona10 merged 3 commits into from
Jun 13, 2025
Merged

gh-126703: add freelist for PyComplexObject's #135233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f031f94
gh-126703: add freelist for PyComplexObject's
skirpichev Jun 7, 2025
cf5287a
Merge branch 'master' into complexes-freelist/126703
skirpichev Jun 13, 2025
b5946f0
address review: _PyObject_ClearFreeLists()
skirpichev Jun 13, 2025
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
Next Next commit
gh-126703: add freelist for PyComplexObject's
  • Loading branch information
@skirpichev
skirpichev committed Jun 7, 2025
commit f031f945d2ec8e6467dbd40e70915d65b34928d4
2 changes: 2 additions & 0 deletions Include/internal/pycore_freelist_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ extern "C" {
# define Py_dicts_MAXFREELIST 80
# define Py_dictkeys_MAXFREELIST 80
# define Py_floats_MAXFREELIST 100
# define Py_complexes_MAXFREELIST 100
# define Py_ints_MAXFREELIST 100
# define Py_slices_MAXFREELIST 1
# define Py_ranges_MAXFREELIST 6
Expand Down Expand Up @@ -43,6 +44,7 @@ struct _Py_freelist {

struct _Py_freelists {
struct _Py_freelist floats;
struct _Py_freelist complexes;
Comment thread
skirpichev marked this conversation as resolved.
struct _Py_freelist ints;
struct _Py_freelist tuples[PyTuple_MAXSAVESIZE];
struct _Py_freelist lists;
Expand Down
28 changes: 22 additions & 6 deletions Objects/complexobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* Complex object implementation */

/* Borrows heavily from floatobject.c */
Expand All @@ -9,6 +8,7 @@
#include "pycore_call.h" // _PyObject_CallNoArgs()
#include "pycore_complexobject.h" // _PyComplex_FormatAdvancedWriter()
#include "pycore_floatobject.h" // _Py_convert_int_to_double()
#include "pycore_freelist.h" // _Py_FREELIST_FREE(), _Py_FREELIST_POP()
#include "pycore_long.h" // _PyLong_GetZero()
#include "pycore_object.h" // _PyObject_Init()
#include "pycore_pymath.h" // _Py_ADJUST_ERANGE2()
Expand Down Expand Up @@ -410,16 +410,32 @@ complex_subtype_from_c_complex(PyTypeObject *type, Py_complex cval)
PyObject *
PyComplex_FromCComplex(Py_complex cval)
{
/* Inline PyObject_New */
PyComplexObject *op = PyObject_Malloc(sizeof(PyComplexObject));
PyComplexObject *op = _Py_FREELIST_POP(PyComplexObject, complexes);

if (op == NULL) {
return PyErr_NoMemory();
/* Inline PyObject_New */
op = PyObject_Malloc(sizeof(PyComplexObject));
if (op == NULL) {
return PyErr_NoMemory();
}
_PyObject_Init((PyObject*)op, &PyComplex_Type);
}
_PyObject_Init((PyObject*)op, &PyComplex_Type);
op->cval = cval;
return (PyObject *) op;
}

static void
complex_dealloc(PyObject *op)
{
assert(PyComplex_Check(op));
if (PyComplex_CheckExact(op)) {
_Py_FREELIST_FREE(complexes, op, PyObject_Free);
}
else {
Py_TYPE(op)->tp_free(op);
}
}

static PyObject *
complex_subtype_from_doubles(PyTypeObject *type, double real, double imag)
{
Expand Down Expand Up @@ -1383,7 +1399,7 @@ PyTypeObject PyComplex_Type = {
"complex",
sizeof(PyComplexObject),
0,
0, /* tp_dealloc */
complex_dealloc, /* tp_dealloc */
0, /* tp_vectorcall_offset */
0, /* tp_getattr */
0, /* tp_setattr */
Expand Down