Skip to content

[3.10] bpo-42972: Fully support GC for mmap heap types (GH-26373) #26407

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
miss-islington merged 1 commit into from
May 27, 2021
Merged

[3.10] bpo-42972: Fully support GC for mmap heap types (GH-26373) #26407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
bpo-42972: Fully support GC for mmap heap types (GH-26373) 
(cherry picked from commit 318adeb)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
  • Loading branch information
@miss-islington
Erlend Egeberg Aasland authored and miss-islington committed May 27, 2021
commit fee6aa1bc041ae5022d98362f7b65436c3440279
13 changes: 10 additions & 3 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,18 @@ get_mmap_state(PyObject *module)
return state;
}

static int
mmap_object_traverse(mmap_object *m_obj, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(m_obj));
return 0;
}

static void
mmap_object_dealloc(mmap_object *m_obj)
{
PyTypeObject *tp = Py_TYPE(m_obj);
PyObject_GC_UnTrack(m_obj);

#ifdef MS_WINDOWS
Py_BEGIN_ALLOW_THREADS
Expand Down Expand Up @@ -1085,15 +1093,14 @@ To map anonymous memory, pass -1 as the fileno (both versions).");

static PyType_Slot mmap_object_slots[] = {
{Py_tp_new, new_mmap_object},
{Py_tp_alloc, PyType_GenericAlloc},
{Py_tp_dealloc, mmap_object_dealloc},
{Py_tp_free, PyObject_Del},
{Py_tp_repr, mmap__repr__method},
{Py_tp_doc, (void *)mmap_doc},
{Py_tp_methods, mmap_object_methods},
{Py_tp_members, mmap_object_members},
{Py_tp_getset, mmap_object_getset},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_traverse, mmap_object_traverse},

/* as sequence */
{Py_sq_length, mmap_length},
Expand All @@ -1114,7 +1121,7 @@ static PyType_Slot mmap_object_slots[] = {
static PyType_Spec mmap_object_spec = {
.name = "mmap.mmap",
.basicsize = sizeof(mmap_object),
.flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC),
.slots = mmap_object_slots,
};

Expand Down