Skip to content

gh-116946: fully implement GC protocol for _tkinter.Tk{app,tt}Object #138331

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
merged 11 commits into from
Sep 11, 2025
Merged

gh-116946: fully implement GC protocol for _tkinter.Tk{app,tt}Object #138331

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84f832f
fully implement GC protocol for `_tkinter` objects
picnixz Sep 1, 2025
a9c01ef
make _tkinter.Tcl_Obj immutable instead of supporting full GC
picnixz Sep 2, 2025
dbb343f
revert changes to `_tkinter.Tcl_Obj`; they will be made later
picnixz Sep 6, 2025
9eb9f47
Merge branch 'main' into fix/gc/tkinter-heap-types-116946
picnixz Sep 6, 2025
8e80641
add tp_clear for visited objects
picnixz Sep 6, 2025
833a85e
use the correct slot...
picnixz Sep 6, 2025
022d71e
revert the revert
picnixz Sep 6, 2025
168fe43
keep the necessary bits
picnixz Sep 6, 2025
5e5f698
remove warnings
picnixz Sep 6, 2025
35915b0
reduce the diff a bit
picnixz Sep 11, 2025
ba9c809
Merge remote-tracking branch 'upstream/main' into fix/gc/tkinter-heap…
picnixz Sep 11, 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
65 changes: 52 additions & 13 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,10 +589,11 @@ Tkapp_New(const char *screenName, const char *className,
int interactive, int wantobjects, int wantTk, int sync,
const char *use)
{
PyTypeObject *type = (PyTypeObject *)Tkapp_Type;
TkappObject *v;
char *argv0;

v = PyObject_New(TkappObject, (PyTypeObject *) Tkapp_Type);
v = (TkappObject *)type->tp_alloc(type, 0);
if (v == NULL)
return NULL;

Expand Down Expand Up @@ -2745,9 +2746,10 @@ _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self)
static TkttObject *
Tktt_New(PyObject *func)
{
PyTypeObject *type = (PyTypeObject *)Tktt_Type;
TkttObject *v;

v = PyObject_New(TkttObject, (PyTypeObject *) Tktt_Type);
v = (TkttObject *)type->tp_alloc(type, 0);
if (v == NULL)
return NULL;

Expand All @@ -2758,19 +2760,33 @@ Tktt_New(PyObject *func)
return (TkttObject*)Py_NewRef(v);
}

static void
Tktt_Dealloc(PyObject *self)
static int
Tktt_Clear(PyObject *op)
{
TkttObject *v = TkttObject_CAST(self);
PyObject *func = v->func;
PyObject *tp = (PyObject *) Py_TYPE(self);

Py_XDECREF(func);
TkttObject *self = TkttObject_CAST(op);
Py_CLEAR(self->func);
return 0;
}

PyObject_Free(self);
static void
Tktt_Dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
(void)Tktt_Clear(op);
tp->tp_free(op);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
tp->tp_free(op);
Py_TYPE(op)->tp_free(op);

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, this temporary variable is needed as we need Py_DECREF(Py_TYPE(op)) otherwise. The rest of the code base also does this.

Py_DECREF(tp);
}

static int
Tktt_Traverse(PyObject *op, visitproc visit, void *arg)
{
TkttObject *self = TkttObject_CAST(op);
Py_VISIT(Py_TYPE(op));
Py_VISIT(self->func);
return 0;
}

static PyObject *
Tktt_Repr(PyObject *self)
{
Expand Down Expand Up @@ -3061,21 +3077,38 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self)

/**** Tkapp Type Methods ****/

static int
Tkapp_Clear(PyObject *op)
{
TkappObject *self = TkappObject_CAST(op);
Py_CLEAR(self->trace);
return 0;
}

static void
Tkapp_Dealloc(PyObject *op)
{
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(op);
TkappObject *self = TkappObject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
/*CHECK_TCL_APPARTMENT;*/
ENTER_TCL
Tcl_DeleteInterp(Tkapp_Interp(self));
LEAVE_TCL
Py_XDECREF(self->trace);
PyObject_Free(self);
(void)Tkapp_Clear(op);
tp->tp_free(self);
Py_DECREF(tp);
DisableEventHook();
}

static int
Tkapp_Traverse(PyObject *op, visitproc visit, void *arg)
{
TkappObject *self = TkappObject_CAST(op);
Py_VISIT(Py_TYPE(op));
Py_VISIT(self->trace);
return 0;
}


/**** Tkinter Module ****/
Expand Down Expand Up @@ -3263,7 +3296,9 @@ static PyMethodDef Tktt_methods[] =
};

static PyType_Slot Tktt_Type_slots[] = {
{Py_tp_clear, Tktt_Clear},
{Py_tp_dealloc, Tktt_Dealloc},
{Py_tp_traverse, Tktt_Traverse},
{Py_tp_repr, Tktt_Repr},
{Py_tp_methods, Tktt_methods},
{0, 0}
Expand All @@ -3276,6 +3311,7 @@ static PyType_Spec Tktt_Type_spec = {
Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
| Py_TPFLAGS_IMMUTABLETYPE
| Py_TPFLAGS_HAVE_GC
),
.slots = Tktt_Type_slots,
};
Expand Down Expand Up @@ -3322,7 +3358,9 @@ static PyMethodDef Tkapp_methods[] =
};

static PyType_Slot Tkapp_Type_slots[] = {
{Py_tp_clear, Tkapp_Clear},
{Py_tp_dealloc, Tkapp_Dealloc},
{Py_tp_traverse, Tkapp_Traverse},
{Py_tp_methods, Tkapp_methods},
{0, 0}
};
Expand All @@ -3335,6 +3373,7 @@ static PyType_Spec Tkapp_Type_spec = {
Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
| Py_TPFLAGS_IMMUTABLETYPE
| Py_TPFLAGS_HAVE_GC
),
.slots = Tkapp_Type_slots,
};
Expand Down
Loading