Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
21 changes: 21 additions & 0 deletions Lib/test/test_capi/test_misc.py
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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix ``PyRefTracer_DESTROY`` not being sent from :file:`Python/ceval.c` ``Py_DECREF()``.
42 changes: 42 additions & 0 deletions Modules/_testcapimodule.c
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
1 change: 1 addition & 0 deletions Python/ceval.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
} \
_Py_DECREF_STAT_INC(); \
if (--op->ob_refcnt == 0) { \
_PyReftracerTrack(op, PyRefTracer_DESTROY); \
destructor dealloc = Py_TYPE(op)->tp_dealloc; \
(*dealloc)(op); \
} \
Expand Down
Loading