diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-08-05 21:17:30 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-08-05 21:17:30 (GMT) |
commit | c53204b9477a2e28b6b366fd271f61c73b805cee (patch) | |
tree | a58457d2a8f68a43ae5ce33adc3da41944b7a547 /Modules/mmapmodule.c | |
parent | 914061ab151a7dd25e9b05091eabbfd2690ee438 (diff) | |
download | cpython-c53204b9477a2e28b6b366fd271f61c73b805cee.zip cpython-c53204b9477a2e28b6b366fd271f61c73b805cee.tar.gz cpython-c53204b9477a2e28b6b366fd271f61c73b805cee.tar.bz2 |
Issue #4885: Add weakref support to mmap objects. Patch by Valerie Lambert.
Diffstat (limited to 'Modules/mmapmodule.c')
-rw-r--r-- | Modules/mmapmodule.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c index 1107eb8..4b4be61 100644 --- a/Modules/mmapmodule.c +++ b/Modules/mmapmodule.c @@ -20,6 +20,7 @@ #define PY_SSIZE_T_CLEAN #include <Python.h> +#include "structmember.h" #ifndef MS_WINDOWS #define UNIX @@ -108,6 +109,7 @@ typedef struct { int fd; #endif + PyObject *weakreflist; access_mode access; } mmap_object; @@ -134,6 +136,8 @@ mmap_object_dealloc(mmap_object *m_obj) } #endif /* UNIX */ + if (m_obj->weakreflist != NULL) + PyObject_ClearWeakRefs((PyObject *) m_obj); Py_TYPE(m_obj)->tp_free((PyObject*)m_obj); } @@ -1032,7 +1036,7 @@ static PyTypeObject mmap_object_type = { 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ + offsetof(mmap_object, weakreflist), /* tp_weaklistoffset */ 0, /* tp_iter */ 0, /* tp_iternext */ mmap_object_methods, /* tp_methods */ @@ -1190,6 +1194,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) m_obj->data = NULL; m_obj->size = (size_t) map_size; m_obj->pos = (size_t) 0; + m_obj->weakreflist = NULL; m_obj->exports = 0; m_obj->offset = offset; if (fd == -1) { @@ -1394,6 +1399,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict) /* set the initial position */ m_obj->pos = (size_t) 0; + m_obj->weakreflist = NULL; m_obj->exports = 0; /* set the tag name */ if (tagname != NULL && *tagname != '\0') { |