BLI_fileops: Add 'BLI_read' wrapper to ensure the requested data is read #113474

Manually merged
Campbell Barton merged 3 commits from ideasman42/blender:pr-read-lfs into main 2023-10-10 13:53:48 +02:00

According to the documentation read isn't required to read all the data requested. Although until recently I hadn't encountered this and none of Blender's code checks for read succeeding but not reading the requested size.

Resolves #113473 where images over 2gb fail to load.


It's surprising to me that this issue hasn't come up earlier, as far as I can tell - technically read can't be relied on to return the requested size, however in practice this almost never happens.


Regarding when to use this function, I'd suggest to do one of the following:

  • Use BLI_read everywhere (replacing all calls to read in source/), as the overhead is negligible.
  • Use BLI_read for all cases the size is unknown ahead of time, if a function uses read to load a fixed number of bytes (an image header for e.g.) leave this using read. For clarity name this BLI_read_with_large_file_support or similar.

Note this this isn't a problem for fread.

According to the documentation `read` isn't required to read all the data requested. Although until recently I hadn't encountered this and none of Blender's code checks for read succeeding but not reading the requested size. Resolves #113473 where images over 2gb fail to load. ---- It's surprising to me that this issue hasn't come up earlier, as far as I can tell - technically `read` can't be relied on to return the requested size, however in practice this almost never happens. ---- Regarding when to use this function, I'd suggest to do one of the following: - Use `BLI_read` *everywhere* (replacing all calls to `read` in `source/`), as the overhead is negligible. - Use `BLI_read` for all cases the size is unknown ahead of time, if a function uses read to load a fixed number of bytes (an image header for e.g.) leave this using `read`. For clarity name this `BLI_read_with_large_file_support` or similar. Note this this isn't a problem for `fread`.
Campbell Barton force-pushed pr-read-lfs from 0def1d40f5 to de6bfabe8d 2023-10-10 08:14:55 +02:00 Compare
Campbell Barton requested review from Brecht Van Lommel 2023-10-10 08:26:19 +02:00
Campbell Barton requested review from Sergey Sharybin 2023-10-10 08:26:36 +02:00
Campbell Barton requested review from Bastien Montagne 2023-10-10 08:32:34 +02:00
Bastien Montagne approved these changes 2023-10-10 09:50:55 +02:00
Bastien Montagne left a comment
Owner

Fairly surprising behavior from read indeed!

Patch LGTM, would suggest to double-check its impact on e.g. big blendfile reading, but would not expect any significant impact on performances either. If everything is fine, would rather replace all our usages of read by the new BLI_read then.

Fairly surprising behavior from `read` indeed! Patch LGTM, would suggest to double-check its impact on e.g. big blendfile reading, but would not expect any significant impact on performances either. If everything is fine, would rather replace all our usages of `read` by the new `BLI_read` then.
Brecht Van Lommel requested changes 2023-10-10 12:46:32 +02:00
Brecht Van Lommel left a comment
Owner

I think it's fine to use this everywhere to replace read.

However on Windows it will still fail to read files > 2GB. There read is an alias for _read, which uses int instead of ssize_t.
https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/read?view=msvc-170

It could be fixed by doing something like this on Windows: read(fd, buf, min(nbytes, INT_MAX))

I think it's fine to use this everywhere to replace `read`. However on Windows it will still fail to read files > 2GB. There `read` is an alias for `_read`, which uses `int` instead of `ssize_t`. https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/read?view=msvc-170 It could be fixed by doing something like this on Windows: `read(fd, buf, min(nbytes, INT_MAX))`
Campbell Barton force-pushed pr-read-lfs from de6bfabe8d to bf6efb1c25 2023-10-10 13:10:21 +02:00 Compare
Campbell Barton requested review from Brecht Van Lommel 2023-10-10 13:10:35 +02:00
Author
Owner

Interesting, I wasn't aware of this read limitation on WIN32, updated the patch.

Interesting, I wasn't aware of this `read` limitation on WIN32, updated the patch.
Campbell Barton force-pushed pr-read-lfs from bf6efb1c25 to 8f893b91a5 2023-10-10 13:17:37 +02:00 Compare
Brecht Van Lommel requested changes 2023-10-10 13:19:14 +02:00
@ -95,0 +104,4 @@
while (true) {
ssize_t nbytes_read = read(fd,
buf,
#ifndef WIN32

ifndef -> ifdef

`ifndef` -> `ifdef`
ideasman42 marked this conversation as resolved
Campbell Barton added 1 commit 2023-10-10 13:22:55 +02:00
Campbell Barton requested review from Brecht Van Lommel 2023-10-10 13:23:02 +02:00
Brecht Van Lommel approved these changes 2023-10-10 13:23:28 +02:00
Campbell Barton manually merged commit fa40724a72 into main 2023-10-10 13:53:48 +02:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#113474
No description provided.