Skip to content
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

fall back to slower stat filesize if optimized filesize fails #55641

Merged
merged 8 commits into from
Sep 23, 2024
Merged

fall back to slower stat filesize if optimized filesize fails #55641

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcee8f5
fall back to slower stat filesize if optimized filesize fails
IanButterworth Aug 30, 2024
0d691e5
fix
IanButterworth Aug 31, 2024
984f884
Update iostream.jl
IanButterworth Aug 31, 2024
bc0c3d9
if non-regular file skip trying to grow since we know that will fail …
IanButterworth Sep 4, 2024
30c3721
address review
oscardssmith Sep 20, 2024
9d88e65
Merge branch 'master' into ib/filesize_fallback_stat
oscardssmith Sep 21, 2024
69c9a3c
defer the grow! fix to a following PR
IanButterworth Sep 23, 2024
35b1904
Merge branch 'master' into ib/filesize_fallback_stat
IanButterworth Sep 23, 2024
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
4 changes: 2 additions & 2 deletions base/iostream.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ end
function filesize(s::IOStream)
sz = @_lock_ios s ccall(:ios_filesize, Int64, (Ptr{Cvoid},), s.ios)
if sz == -1
err = Libc.errno()
throw(IOError(string("filesize: ", Libc.strerror(err), " for ", s.name), err))
# if `s` is not seekable `ios_filesize` can fail, so fall back to slower stat method
sz = filesize(stat(s))
end
return sz
end
Expand Down
2 changes: 2 additions & 0 deletions stdlib/Mmap/src/Mmap.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ grow!(::Anonymous,o::Integer,l::Integer) = return
function grow!(io::IO, offset::Integer, len::Integer)
pos = position(io)
filelen = filesize(io)
# If non-regular file skip trying to grow since we know that will fail the ftruncate syscall
filelen == 0 && isfile(stat(io)) && return
oscardssmith marked this conversation as resolved.
Show resolved Hide resolved
if filelen < offset + len
failure = ccall(:jl_ftruncate, Cint, (Cint, Int64), fd(io), offset+len)
Base.systemerror(:ftruncate, failure != 0)
Expand Down
Loading