mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

closes bpo-36139: release GIL around munmap(). (GH-12073)

This commit is contained in:
Davide Rizzo 2019-03-06 16:52:34 +01:00 committed by Benjamin Peterson
parent b71e28ea91
commit bb9593af0a
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2019-03-06-13-07-29.bpo-36139.6kedum.rst Normal file
View File

@ -0,0 +1 @@
Release GIL when closing :class:`~mmap.mmap` objects.

39
Modules/mmapmodule.c
View File

@ -117,6 +117,7 @@ typedef struct {
static void static void
mmap_object_dealloc(mmap_object *m_obj) mmap_object_dealloc(mmap_object *m_obj)
{ {
Py_BEGIN_ALLOW_THREADS
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (m_obj->data != NULL) if (m_obj->data != NULL)
UnmapViewOfFile (m_obj->data); UnmapViewOfFile (m_obj->data);
@ -135,6 +136,7 @@ mmap_object_dealloc(mmap_object *m_obj)
munmap(m_obj->data, m_obj->size); munmap(m_obj->data, m_obj->size);
} }
#endif /* UNIX */ #endif /* UNIX */
Py_END_ALLOW_THREADS
if (m_obj->weakreflist != NULL) if (m_obj->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) m_obj); PyObject_ClearWeakRefs((PyObject *) m_obj);
@ -157,28 +159,37 @@ mmap_close_method(mmap_object *self, PyObject *unused)
again. again.
TODO - should we check for errors in the close operations??? TODO - should we check for errors in the close operations???
*/ */
if (self->data != NULL) { HANDLE map_handle = self->map_handle;
UnmapViewOfFile(self->data); HANDLE file_handle = self->file_handle;
self->data = NULL; char *data = self->data;
self->map_handle = NULL;
self->file_handle = INVALID_HANDLE_VALUE;
self->data = NULL;
Py_BEGIN_ALLOW_THREADS
if (data != NULL) {
UnmapViewOfFile(data);
} }
if (self->map_handle != NULL) { if (map_handle != NULL) {
CloseHandle(self->map_handle); CloseHandle(map_handle);
self->map_handle = NULL;
} }
if (self->file_handle != INVALID_HANDLE_VALUE) { if (file_handle != INVALID_HANDLE_VALUE) {
CloseHandle(self->file_handle); CloseHandle(file_handle);
self->file_handle = INVALID_HANDLE_VALUE;
} }
Py_END_ALLOW_THREADS
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
#ifdef UNIX #ifdef UNIX
if (0 <= self->fd) int fd = self->fd;
(void) close(self->fd); char *data = self->data;
self->fd = -1; self->fd = -1;
if (self->data != NULL) { self->data = NULL;
munmap(self->data, self->size); Py_BEGIN_ALLOW_THREADS
self->data = NULL; if (0 <= fd)
(void) close(fd);
if (data != NULL) {
munmap(data, self->size);
} }
Py_END_ALLOW_THREADS
#endif #endif
Py_RETURN_NONE; Py_RETURN_NONE;