Skip to content

bpo-32186: Release the GIL during lseek and fstat #4652

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

Merged
merged 3 commits into from
Dec 1, 2017
Merged

bpo-32186: Release the GIL during lseek and fstat #4652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1258ef4
bpo-32186: Release the GIL during lseek and fstat
nirs Nov 30, 2017
ffd6f44
Add news entry
nirs Nov 30, 2017
4da8169
Clarify the news entry
nirs Nov 30, 2017
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
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2017-11-30-20-38-16.bpo-32186.O42bVe.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
io.FileIO.readall() and io.FileIO.read() now release the GIL when
getting the file size. Fixed hang of all threads with inaccessible NFS
server. Patch by Nir Soffer.
6 changes: 5 additions & 1 deletion Modules/_io/fileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,19 +683,23 @@ _io_FileIO_readall_impl(fileio *self)
Py_ssize_t bytes_read = 0;
Py_ssize_t n;
size_t bufsize;
int fstat_result;

if (self->fd < 0)
return err_closed();

Py_BEGIN_ALLOW_THREADS
_Py_BEGIN_SUPPRESS_IPH
#ifdef MS_WINDOWS
pos = _lseeki64(self->fd, 0L, SEEK_CUR);
#else
pos = lseek(self->fd, 0L, SEEK_CUR);
#endif
_Py_END_SUPPRESS_IPH
fstat_result = _Py_fstat_noraise(self->fd, &status);
Py_END_ALLOW_THREADS

if (_Py_fstat_noraise(self->fd, &status) == 0)
if (fstat_result == 0)
end = status.st_size;
else
end = (Py_off_t)-1;
Expand Down