Skip to content

Fixes #2748 by filling the streaming buffers fully #2750

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
kinnison merged 2 commits into from
May 4, 2021
Merged

Fixes #2748 by filling the streaming buffers fully #2750

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
98365c3
Fixes #2748 by filling the streaming buffers fully
May 4, 2021
ad3ce8b
Drop written buffers before reclaiming the budget.
rbtcollins May 4, 2021
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 src/diskio/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ pub fn write_file_incremental<P: AsRef<Path>, F: Fn(usize)>(
{
trace_scoped!("write_segment", "name": path_display, "len": len);
f.write_all(&contents)?;
drop(contents);
chunk_complete_callback(len);
}
}
Expand Down
27 changes: 18 additions & 9 deletions src/dist/component/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,16 +364,18 @@ fn unpack_without_first_dir<'a, R: Read>(
continue;
}

struct SenderEntry<'a, 'b, R: std::io::Read> {
sender: Box<dyn FnMut(Vec<u8>) -> bool + 'a>,
entry: tar::Entry<'b, R>,
}

/// true if either no sender_entry was provided, or the incremental file
/// has been fully dispatched.
fn flush_ios<'a, R: std::io::Read, P: AsRef<Path>>(
mut budget: &mut MemoryBudget,
io_executor: &dyn Executor,
mut directories: &mut HashMap<PathBuf, DirStatus>,
mut sender_entry: Option<&mut (
Box<dyn FnMut(Vec<u8>) -> bool + 'a>,
&mut tar::Entry<'_, R>,
)>,
mut sender_entry: Option<&mut SenderEntry<'a, '_, R>>,
full_path: P,
) -> Result<bool> {
let mut result = sender_entry.is_none();
Expand All @@ -384,16 +386,20 @@ fn unpack_without_first_dir<'a, R: Read>(
trigger_children(&*io_executor, &mut directories, &mut budget, op)?;
}
// Maybe stream a file incrementally
if let Some((sender, entry)) = sender_entry.as_mut() {
if let Some(sender) = sender_entry.as_mut() {
if budget.available() as u64 >= IO_CHUNK_SIZE {
let mut v = vec![0; IO_CHUNK_SIZE as usize];
let len = entry.read(&mut v)?;
let len = sender
.entry
.by_ref()
.take(IO_CHUNK_SIZE)
.read_to_end(&mut v)?;
if len == 0 {
result = true;
}
v.resize(len, 0);
budget.claim_chunk(len);
if !sender(v) {
if !(sender.sender)(v) {
bail!(format!(
"IO receiver for '{}' disconnected",
full_path.as_ref().display()
Expand Down Expand Up @@ -519,8 +525,11 @@ fn unpack_without_first_dir<'a, R: Read>(
}
}

let mut incremental_file_sender = incremental_file_sender
.map(|incremental_file_sender| (incremental_file_sender, &mut entry));
let mut incremental_file_sender =
incremental_file_sender.map(|incremental_file_sender| SenderEntry {
sender: incremental_file_sender,
entry,
});

// monitor io queue and feed in the content of the file (if needed)
while !flush_ios(
Expand Down
⚡