Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-03-21 20:26:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 84489 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84489 | antoine.pitrou | 2010-09-04 19:21:57 +0200 (sam., 04 sept. 2010) | 4 lines

  Issue #7736: Release the GIL around calls to opendir() and closedir()
  in the posix module.  Patch by Marcin Bachry.
........
This commit is contained in:
Antoine Pitrou 2010-09-04 17:27:10 +00:00
parent 6807958dd4
commit 247e2fd035
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -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.

11
Modules/posixmodule.c
View file

@ -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;