summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/posixmodule.c11
2 files changed, 13 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c831344..914c5f1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -225,6 +225,9 @@ Library
Extension Modules
-----------------
+- Issue #7736: Release the GIL around calls to opendir() and closedir()
+ in the posix module. Patch by Marcin Bachry.
+
- As a result of issue #2521, the _weakref module is now compiled into the
interpreter by default.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 5237f14..933dbd9 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2333,11 +2333,16 @@ posix_listdir(PyObject *self, PyObject *args)
}
if (!PyArg_ParseTuple(args, "et:listdir", Py_FileSystemDefaultEncoding, &name))
return NULL;
- if ((dirp = opendir(name)) == NULL) {
+ Py_BEGIN_ALLOW_THREADS
+ dirp = opendir(name);
+ Py_END_ALLOW_THREADS
+ if (dirp == NULL) {
return posix_error_with_allocated_filename(name);
}
if ((d = PyList_New(0)) == NULL) {
+ Py_BEGIN_ALLOW_THREADS
closedir(dirp);
+ Py_END_ALLOW_THREADS
PyMem_Free(name);
return NULL;
}
@@ -2350,7 +2355,9 @@ posix_listdir(PyObject *self, PyObject *args)
if (errno == 0) {
break;
} else {
+ Py_BEGIN_ALLOW_THREADS
closedir(dirp);
+ Py_END_ALLOW_THREADS
Py_DECREF(d);
return posix_error_with_allocated_filename(name);
}
@@ -2391,7 +2398,9 @@ posix_listdir(PyObject *self, PyObject *args)
}
Py_DECREF(v);
}
+ Py_BEGIN_ALLOW_THREADS
closedir(dirp);
+ Py_END_ALLOW_THREADS
PyMem_Free(name);
return d;