Skip to content

Revert "closes bpo-36139: release GIL around munmap(). (GH-12073)" #12198

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

Closed
vstinner wants to merge 1 commit into from
Closed

Revert "closes bpo-36139: release GIL around munmap(). (GH-12073)" #12198

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Misc/NEWS.d/next/Library/2019-03-06-13-07-29.bpo-36139.6kedum.rst
View file
Open in desktop

This file was deleted.

39 changes: 14 additions & 25 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ typedef struct {
static void
mmap_object_dealloc(mmap_object *m_obj)
{
Py_BEGIN_ALLOW_THREADS
#ifdef MS_WINDOWS
if (m_obj->data != NULL)
UnmapViewOfFile (m_obj->data);
Expand All @@ -136,7 +135,6 @@ mmap_object_dealloc(mmap_object *m_obj)
munmap(m_obj->data, m_obj->size);
}
#endif /* UNIX */
Py_END_ALLOW_THREADS

if (m_obj->weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) m_obj);
Expand All @@ -159,37 +157,28 @@ mmap_close_method(mmap_object *self, PyObject *unused)
again.
TODO - should we check for errors in the close operations???
*/
HANDLE map_handle = self->map_handle;
HANDLE file_handle = self->file_handle;
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->data != NULL) {
UnmapViewOfFile(self->data);
self->data = NULL;
}
if (map_handle != NULL) {
CloseHandle(map_handle);
if (self->map_handle != NULL) {
CloseHandle(self->map_handle);
self->map_handle = NULL;
}
if (file_handle != INVALID_HANDLE_VALUE) {
CloseHandle(file_handle);
if (self->file_handle != INVALID_HANDLE_VALUE) {
CloseHandle(self->file_handle);
self->file_handle = INVALID_HANDLE_VALUE;
}
Py_END_ALLOW_THREADS
#endif /* MS_WINDOWS */

#ifdef UNIX
int fd = self->fd;
char *data = self->data;
if (0 <= self->fd)
(void) close(self->fd);
self->fd = -1;
self->data = NULL;
Py_BEGIN_ALLOW_THREADS
if (0 <= fd)
(void) close(fd);
if (data != NULL) {
munmap(data, self->size);
if (self->data != NULL) {
munmap(self->data, self->size);
self->data = NULL;
}
Py_END_ALLOW_THREADS
#endif

Py_RETURN_NONE;
Expand Down