Skip to content

gh-117142: ctypes: Migrate global closure freelist to thunk-type state #117874

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

Closed
neonene wants to merge 11 commits into from
Closed

gh-117142: ctypes: Migrate global closure freelist to thunk-type state #117874

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f02a06d
globals-to-fix.tsv
neonene Apr 14, 2024
58d6beb
move free_list to thunk type state
neonene Apr 14, 2024
c9b1154
add a test
neonene Apr 14, 2024
71d12e3
check USING_MALLOC_CLOSURE_DOT_C
neonene Apr 14, 2024
f502626
fix tag name
neonene Apr 14, 2024
a2a53a0
tune a test
neonene Apr 14, 2024
8b987a9
edit test
neonene Apr 15, 2024
9178936
experiment
neonene May 6, 2024
a78f36a
experiment retry
neonene May 6, 2024
a2ec9df
experiment retry
neonene May 6, 2024
de53f39
experiment retry
neonene May 6, 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
Prev Previous commit
Next Next commit
tune a test
  • Loading branch information
@neonene
neonene committed Apr 14, 2024
commit a2a53a05640901b36e1ddb617f8b2af87a6375f6
2 changes: 1 addition & 1 deletion Lib/test/test_ctypes/test_refcounts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_many_closures_per_module(self):
"cfuncs = [cfunc_type(pyfunc) for i in range(500)];"
"cthunk_tp = type(cfuncs[0]._objects['0']);"
"ismeta = type(cthunk_tp) is not type;"
"n_containers = ismeta and cthunk_tp.ffi_closure_containers_count;"
"n_containers = ismeta and cthunk_tp.get_ffi_closure_containers_count();"
"exit(n_containers and n_containers < 2)"
)
script_helper.assert_python_ok("-c", script)
Expand Down
13 changes: 6 additions & 7 deletions Modules/_ctypes/malloc_closure.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,23 +231,22 @@ CThunkType_dealloc(PyObject *self)
}

static PyObject *
CThunkType_get_narenas(PyTypeObject *self, void *Py_UNUSED(ignored))
CThunkType_get_narenas(PyObject *self, PyObject *Py_UNUSED(ignored))
{
thunk_type_state *st = get_type_state(self);
thunk_type_state *st = get_type_state((PyTypeObject *)self);
return PyLong_FromSsize_t(st->narenas);
}

static PyGetSetDef CThunkType_getsets[] = {
{"ffi_closure_containers_count", (getter)CThunkType_get_narenas,
NULL, NULL, NULL},
{0}
static PyMethodDef CThunkType_methods[] = {
{"get_ffi_closure_containers_count", CThunkType_get_narenas, METH_NOARGS, NULL},
{0},
};

static PyType_Slot cthunk_type_slots[] = {
{Py_tp_getset, CThunkType_getsets},
{Py_tp_traverse, CThunkType_traverse},
{Py_tp_clear, CThunkType_clear},
{Py_tp_dealloc, CThunkType_dealloc},
{Py_tp_methods, CThunkType_methods},
{0, NULL},
};

Expand Down