From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 4 Sep 2010 17:21:57 +0000 (+0000)
Subject: Issue #7736: Release the GIL around calls to opendir() and closedir()
X-Git-Tag: v3.2a2~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3ccde8a21755046cdb3f73fb11e46d1043dc076;p=thirdparty%2FPython%2Fcpython.git

Issue #7736: Release the GIL around calls to opendir() and closedir()
in the posix module.  Patch by Marcin Bachry.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index bf907a5be2e7..1433598749d9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -93,6 +93,9 @@ Core and Builtins
 Extensions
 ----------
 
+- Issue #7736: Release the GIL around calls to opendir() and closedir()
+  in the posix module.  Patch by Marcin Bachry.
+
 - Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private
   to the socket module, and fix the width of socket descriptors to be
   correctly detected under 64-bit Windows.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ce625b4b54b8..1080c7e07142 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -2580,11 +2580,16 @@ posix_listdir(PyObject *self, PyObject *args)
       oname = PyBytes_FromString(".");
     }
     name = PyBytes_AsString(oname);
-    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(oname);
     }
     if ((d = PyList_New(0)) == NULL) {
+        Py_BEGIN_ALLOW_THREADS
         closedir(dirp);
+        Py_END_ALLOW_THREADS
         Py_DECREF(oname);
         return NULL;
     }
@@ -2597,7 +2602,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(oname);
             }
@@ -2621,7 +2628,9 @@ posix_listdir(PyObject *self, PyObject *args)
         }
         Py_DECREF(v);
     }
+    Py_BEGIN_ALLOW_THREADS
     closedir(dirp);
+    Py_END_ALLOW_THREADS
     Py_DECREF(oname);
 
     return d;