diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-05-27 16:43:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 16:43:56 (GMT) |
| commit | da8097aaf5a55c23f5b5ddbeffc2d90d06e00d93 (patch) | |
| tree | 087736fcf88e0bf73203b4fdf61fa7db53cb3c44 /Modules | |
| parent | e73b3b1cd48c92d847990e220cb9cbdbde86476a (diff) | |
| download | cpython-da8097aaf5a55c23f5b5ddbeffc2d90d06e00d93.zip cpython-da8097aaf5a55c23f5b5ddbeffc2d90d06e00d93.tar.gz cpython-da8097aaf5a55c23f5b5ddbeffc2d90d06e00d93.tar.bz2 | |
bpo-42972: Fully support GC for mmap heap types (GH-26373)
(cherry picked from commit 318adeba780851c416505e48a3454cacca831419)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/mmapmodule.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 9a2542f..8327ba6 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -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 @@ -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}, @@ -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, }; |