Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-44219: Release the GIL during isatty syscalls (GH-28250)

Browse source 
Release the GIL while performing isatty() system calls on arbitrary
file descriptors. In particular, this affects os.isatty(),
os.device_encoding() and io.TextIOWrapper. By extension,
io.open() in text mode is also affected.
(cherry picked from commit 06148b1870)

Co-authored-by: Vincent Michel <vxgmichel@gmail.com>
This commit is contained in:
Miss Islington (bot) 2021-09-09 06:40:42 -07:00 • committed by GitHub
parent dc2e11ed5a
commit 5c65834d80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS.d/next/Core and Builtins/2021-09-09-10-32-33.bpo-44219.WiYyjz.rst Normal file
View file

@ -0,0 +1,4 @@
Release the GIL while performing ``isatty`` system calls on arbitrary file
descriptors. In particular, this affects :func:`os.isatty`,
:func:`os.device_encoding` and :class:`io.TextIOWrapper`. By extension,
:func:`io.open` in text mode is also affected.

2
Modules/posixmodule.c
View file

@ -10058,9 +10058,11 @@ os_isatty_impl(PyObject *module, int fd)
/*[clinic end generated code: output=6a48c8b4e644ca00 input=08ce94aa1eaf7b5e]*/ /*[clinic end generated code: output=6a48c8b4e644ca00 input=08ce94aa1eaf7b5e]*/
{ {
int return_value; int return_value;
Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH _Py_BEGIN_SUPPRESS_IPH
return_value = isatty(fd); return_value = isatty(fd);
_Py_END_SUPPRESS_IPH _Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS
return return_value; return return_value;
} }

16
Python/fileutils.c
View file

@ -69,9 +69,11 @@ _Py_device_encoding(int fd)
UINT cp; UINT cp;
#endif #endif
int valid; int valid;
Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH _Py_BEGIN_SUPPRESS_IPH
valid = isatty(fd); valid = isatty(fd);
_Py_END_SUPPRESS_IPH _Py_END_SUPPRESS_IPH
Py_END_ALLOW_THREADS
if (!valid) if (!valid)
Py_RETURN_NONE; Py_RETURN_NONE;
@ -1737,12 +1739,22 @@ _Py_write_impl(int fd, const void *buf, size_t count, int gil_held)
_Py_BEGIN_SUPPRESS_IPH _Py_BEGIN_SUPPRESS_IPH
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if (count > 32767 && isatty(fd)) { if (count > 32767) {
/* Issue #11395: the Windows console returns an error (12: not /* Issue #11395: the Windows console returns an error (12: not
enough space error) on writing into stdout if stdout mode is enough space error) on writing into stdout if stdout mode is
binary and the length is greater than 66,000 bytes (or less, binary and the length is greater than 66,000 bytes (or less,
depending on heap usage). */ depending on heap usage). */
count = 32767; if (gil_held) {
Py_BEGIN_ALLOW_THREADS
if (isatty(fd)) {
count = 32767;
}
Py_END_ALLOW_THREADS
} else {
if (isatty(fd)) {
count = 32767;
}
}
} }
#endif #endif
if (count > _PY_WRITE_MAX) { if (count > _PY_WRITE_MAX) {