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

feat(files): remove spawning a thread for each file handling, as it does more harm than actually blocking #3531

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(files): remove spawning a thread for each file handling, as it does more harm than actually blocking #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d292546
feat(files): remove block on, as it does more harm than good here
joelwurtz Dec 13, 2024
8a33464
Merge branch 'master' into feat/perf-for-files
robjtede Dec 29, 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
1 change: 1 addition & 0 deletions actix-files/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Minimum supported Rust version (MSRV) is now 1.75.
- Avoid spawning a thread for each file which does more harm than good

## 0.6.6

Expand Down
21 changes: 8 additions & 13 deletions actix-files/src/chunked.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,17 @@ async fn chunked_read_file_callback(
) -> Result<(File, Bytes), Error> {
use io::{Read as _, Seek as _};

let res = actix_web::web::block(move || {
let mut buf = Vec::with_capacity(max_bytes);
let mut buf = Vec::with_capacity(max_bytes);

file.seek(io::SeekFrom::Start(offset))?;
file.seek(io::SeekFrom::Start(offset))?;

let n_bytes = file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;
let n_bytes = file.by_ref().take(max_bytes as u64).read_to_end(&mut buf)?;

if n_bytes == 0 {
Err(io::Error::from(io::ErrorKind::UnexpectedEof))
} else {
Ok((file, Bytes::from(buf)))
}
})
.await??;

Ok(res)
if n_bytes == 0 {
Err(Error::from(io::Error::from(io::ErrorKind::UnexpectedEof)))
} else {
Ok((file, Bytes::from(buf)))
}
}

#[cfg(feature = "experimental-io-uring")]
Expand Down
Loading