Skip to content

gh-130382: add missing _PyReftracerTrack to ceval DECREF #130689

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
colesbury merged 8 commits into from
Mar 13, 2025
Merged

gh-130382: add missing _PyReftracerTrack to ceval DECREF #130689

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f59e619
gh-130382: add missing _PyReftracerTrack to ceval DECREF
tom-pytel Feb 28, 2025
1fd3e46
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 28, 2025
7415668
fix news
tom-pytel Feb 28, 2025
9880687
add test using _testcapimodule
tom-pytel Mar 4, 2025
d44a362
fix format
tom-pytel Mar 4, 2025
78cac86
this test is starting to get silly
tom-pytel Mar 4, 2025
e0827a5
much better
tom-pytel Mar 5, 2025
5f423bc
Merge branch 'main' into fix-issue-130382
colesbury Mar 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
Prev Previous commit
Next Next commit
add test using _testcapimodule
  • Loading branch information
@tom-pytel
tom-pytel committed Mar 4, 2025
commit 9880687438d490aba551c56141a3bcdae165dc8b
21 changes: 21 additions & 0 deletions Lib/test/test_capi/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,5 +2884,26 @@ def test_pack_version_ctypes(self):
self.assertEqual(result, expected)


class TestCEval(unittest.TestCase):
def test_ceval_decref(self):
def f():
l = []
del l

def g():
l = [], []
del l

_testcapi.toggle_reftrace_counter()
f()
refs = _testcapi.toggle_reftrace_counter()
self.assertEqual(refs, (1, 1))

_testcapi.toggle_reftrace_counter()
g()
refs = _testcapi.toggle_reftrace_counter()
self.assertEqual(refs, (3, 3))


if __name__ == "__main__":
unittest.main()
42 changes: 42 additions & 0 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2514,6 +2514,47 @@ code_offset_to_line(PyObject* self, PyObject* const* args, Py_ssize_t nargsf)
return PyLong_FromInt32(PyCode_Addr2Line(code, offset));
}

typedef struct {
Py_ssize_t create_count;
Py_ssize_t destroy_count;
void *prev_data;
int (*prev_tracer)(PyObject *, PyRefTracerEvent, void *);
} reftrace_counter_data;

static int _reftrace_counter(PyObject *obj, PyRefTracerEvent event, void *counter_data)
{
if (event == PyRefTracer_CREATE) {
((reftrace_counter_data *)counter_data)->create_count++;
} else {
((reftrace_counter_data *)counter_data)->destroy_count++;
}
return 0;
}

// A very simple reftrace counter for very simple tests
static PyObject *
toggle_reftrace_counter(PyObject *ob, PyObject *Py_UNUSED(args))
{
static reftrace_counter_data counter_data = {0, 0, NULL, (void *)toggle_reftrace_counter}; // sentinel

if (counter_data.prev_tracer == (void *)toggle_reftrace_counter) {
// toggle counter on
counter_data.create_count = counter_data.destroy_count = 0;
counter_data.prev_tracer = PyRefTracer_GetTracer(&counter_data.prev_data);

PyRefTracer_SetTracer(_reftrace_counter, &counter_data);

Py_RETURN_NONE;
}

// toggle counter off
PyRefTracer_SetTracer(counter_data.prev_tracer, counter_data.prev_data);

counter_data.prev_tracer = (void *)toggle_reftrace_counter;

return Py_BuildValue("(nn)", counter_data.create_count, counter_data.destroy_count);
}


static PyMethodDef TestMethods[] = {
{"set_errno", set_errno, METH_VARARGS},
Expand Down Expand Up @@ -2608,6 +2649,7 @@ static PyMethodDef TestMethods[] = {
{"finalize_thread_hang", finalize_thread_hang, METH_O, NULL},
{"test_atexit", test_atexit, METH_NOARGS},
{"code_offset_to_line", _PyCFunction_CAST(code_offset_to_line), METH_FASTCALL},
{"toggle_reftrace_counter", toggle_reftrace_counter, METH_NOARGS},
{NULL, NULL} /* sentinel */
};

Expand Down
Loading