Mirrors/xc
1
0
Fork 0
mirror of https://github.com/michael-yuji/xc.git synced 2025-12-11 17:29:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix copy_file_range usage. This function should be call in a loop

Browse Source
This commit is contained in:
elliptic
2024-03-31 04:04:33 -04:00
parent 89918fd1f0
commit 44f2abf12b
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
freebsd/src/lib.rs
View File

@@ -489,3 +489,30 @@ impl FreeBSDCommandExt for std::process::Command {
self
}
}
pub fn copy_file_range(source_fd: i32, s_offset: i64, dest_fd: i32, d_offset: i64, max_len: usize) -> nix::Result<usize> {
unsafe {
let mut source_offset = s_offset;
let mut dest_offset = d_offset;
let mut remaining_len = max_len;
let mut copied_len = 0usize;
loop {
match nix::libc::copy_file_range(source_fd, &mut source_offset, dest_fd, &mut dest_offset, remaining_len, 0) {
0 => {
break Ok(copied_len)
},
-1 => {
break Err(nix::Error::last())
},
m => {
assert!(m.is_positive());
let n = m as usize;
assert!(n <= remaining_len);
remaining_len -= n;
copied_len += n;
}
}
}
}
}

16
xcd/src/ipc.rs
View File

@@ -885,15 +885,9 @@ async fn fd_import(
info!("import: content_type is {content_type}");
unsafe {
freebsd::nix::libc::copy_file_range(
source_fd,
std::ptr::null_mut(),
dest_fd,
std::ptr::null_mut(),
file_len,
0,
);
if let Err(error) = freebsd::copy_file_range(source_fd, 0, dest_fd, 0, file_len) {
error!(error=error.to_string(), "copy_file_range failed");
return ipc_err(EIO, "failed to copyin archive")
}
info!("copy_file_range done");
@@ -922,8 +916,8 @@ async fn fd_import(
let diff_id = OciDigest::new_unchecked(output_lines[0].trim());
let archive_digest = OciDigest::new_unchecked(output_lines[1].trim());
info!("diff_id: {diff_id}");
info!("archive_digest: {archive_digest}");
info!(diff_id=diff_id.as_str(), "diff_id");
info!(archive_digest=archive_digest.as_str(), "archive_digest");
let path = {
let mut path = config.layers_dir.to_path_buf();