* virtfs file: update cursor position on fd_read
If a handle is backed by InMemoryFile, fd_read (turned into
Handle::read_vectored) doesn't update the cursor position properly and
thus prevents the caller from detecting EOF.
* virtfs file: fd_{pread,pwrite}: update offset in iovec iteration
If multiple iovec's are supplied, fd_pread and fd_pwrite previously
access data at the same offset for each iovec.
159 lines
5.0 KiB
Rust
159 lines
5.0 KiB
Rust
use more_asserts::assert_gt;
|
|
use std::{env, process};
|
|
use std::convert::TryInto;
|
|
use wasi_tests::open_scratch_directory;
|
|
|
|
unsafe fn test_file_pread_pwrite(dir_fd: wasi::Fd) {
|
|
// Create a file in the scratch directory.
|
|
let file_fd = wasi::path_open(
|
|
dir_fd,
|
|
0,
|
|
"file",
|
|
wasi::OFLAGS_CREAT,
|
|
wasi::RIGHTS_FD_READ | wasi::RIGHTS_FD_SEEK | wasi::RIGHTS_FD_WRITE,
|
|
0,
|
|
0,
|
|
)
|
|
.expect("opening a file");
|
|
assert_gt!(
|
|
file_fd,
|
|
libc::STDERR_FILENO as wasi::Fd,
|
|
"file descriptor range check",
|
|
);
|
|
|
|
let contents = &[0u8, 1, 2, 3];
|
|
let ciovec = wasi::Ciovec {
|
|
buf: contents.as_ptr() as *const _,
|
|
buf_len: contents.len(),
|
|
};
|
|
let mut nwritten =
|
|
wasi::fd_pwrite(file_fd, &mut [ciovec], 0).expect("writing bytes at offset 0");
|
|
assert_eq!(nwritten, 4, "nwritten bytes check");
|
|
|
|
let contents = &mut [0u8; 4];
|
|
let iovec = wasi::Iovec {
|
|
buf: contents.as_mut_ptr() as *mut _,
|
|
buf_len: contents.len(),
|
|
};
|
|
let mut nread = wasi::fd_pread(file_fd, &[iovec], 0).expect("reading bytes at offset 0");
|
|
assert_eq!(nread, 4, "nread bytes check");
|
|
assert_eq!(contents, &[0u8, 1, 2, 3], "written bytes equal read bytes");
|
|
|
|
// Write all the data through multiple iovecs.
|
|
//
|
|
// Note that this needs to be done with a loop, because some
|
|
// platforms do not support writing multiple iovecs at once.
|
|
// See https://github.com/rust-lang/rust/issues/74825.
|
|
let contents = &[0u8, 1, 2, 3];
|
|
let mut offset = 0usize;
|
|
loop {
|
|
let mut ciovecs: Vec<wasi::Ciovec> = Vec::new();
|
|
let mut remaining = contents.len() - offset;
|
|
if remaining > 2 {
|
|
ciovecs.push(
|
|
wasi::Ciovec {
|
|
buf: contents[offset..].as_ptr() as *const _,
|
|
buf_len: 2,
|
|
},
|
|
);
|
|
remaining -= 2;
|
|
}
|
|
ciovecs.push(
|
|
wasi::Ciovec {
|
|
buf: contents[contents.len() - remaining..].as_ptr() as *const _,
|
|
buf_len: remaining
|
|
},
|
|
);
|
|
|
|
nwritten =
|
|
wasi::fd_pwrite(file_fd, ciovecs.as_slice(), offset.try_into().unwrap()).expect("writing bytes at offset 0");
|
|
|
|
offset += nwritten;
|
|
if offset == contents.len() {
|
|
break;
|
|
}
|
|
}
|
|
assert_eq!(offset, 4, "nread bytes check");
|
|
|
|
// Read all the data through multiple iovecs.
|
|
//
|
|
// Note that this needs to be done with a loop, because some
|
|
// platforms do not support reading multiple iovecs at once.
|
|
// See https://github.com/rust-lang/rust/issues/74825.
|
|
let contents = &mut [0u8; 4];
|
|
let mut offset = 0usize;
|
|
loop {
|
|
let buffer = &mut [0u8; 4];
|
|
let iovecs = &[
|
|
wasi::Iovec {
|
|
buf: buffer.as_mut_ptr() as *mut _,
|
|
buf_len: 2,
|
|
},
|
|
wasi::Iovec {
|
|
buf: buffer[2..].as_mut_ptr() as *mut _,
|
|
buf_len: 2
|
|
},
|
|
];
|
|
nread = wasi::fd_pread(file_fd, iovecs, offset as _).expect("reading bytes at offset 0");
|
|
if nread == 0 {
|
|
break;
|
|
}
|
|
contents[offset..offset+nread].copy_from_slice(&buffer[0..nread]);
|
|
offset += nread;
|
|
}
|
|
assert_eq!(offset, 4, "nread bytes check");
|
|
assert_eq!(contents, &[0u8, 1, 2, 3], "file cursor was overwritten");
|
|
|
|
let contents = &mut [0u8; 4];
|
|
let iovec = wasi::Iovec {
|
|
buf: contents.as_mut_ptr() as *mut _,
|
|
buf_len: contents.len(),
|
|
};
|
|
nread = wasi::fd_pread(file_fd, &[iovec], 2).expect("reading bytes at offset 2");
|
|
assert_eq!(nread, 2, "nread bytes check");
|
|
assert_eq!(contents, &[2u8, 3, 0, 0], "file cursor was overwritten");
|
|
|
|
let contents = &[1u8, 0];
|
|
let ciovec = wasi::Ciovec {
|
|
buf: contents.as_ptr() as *const _,
|
|
buf_len: contents.len(),
|
|
};
|
|
nwritten = wasi::fd_pwrite(file_fd, &mut [ciovec], 2).expect("writing bytes at offset 2");
|
|
assert_eq!(nwritten, 2, "nwritten bytes check");
|
|
|
|
let contents = &mut [0u8; 4];
|
|
let iovec = wasi::Iovec {
|
|
buf: contents.as_mut_ptr() as *mut _,
|
|
buf_len: contents.len(),
|
|
};
|
|
nread = wasi::fd_pread(file_fd, &[iovec], 0).expect("reading bytes at offset 0");
|
|
assert_eq!(nread, 4, "nread bytes check");
|
|
assert_eq!(contents, &[0u8, 1, 1, 0], "file cursor was overwritten");
|
|
|
|
wasi::fd_close(file_fd).expect("closing a file");
|
|
wasi::path_unlink_file(dir_fd, "file").expect("removing a file");
|
|
}
|
|
|
|
fn main() {
|
|
let mut args = env::args();
|
|
let prog = args.next().unwrap();
|
|
let arg = if let Some(arg) = args.next() {
|
|
arg
|
|
} else {
|
|
eprintln!("usage: {} <scratch directory>", prog);
|
|
process::exit(1);
|
|
};
|
|
|
|
// Open scratch directory
|
|
let dir_fd = match open_scratch_directory(&arg) {
|
|
Ok(dir_fd) => dir_fd,
|
|
Err(err) => {
|
|
eprintln!("{}", err);
|
|
process::exit(1)
|
|
}
|
|
};
|
|
|
|
// Run the tests.
|
|
unsafe { test_file_pread_pwrite(dir_fd) }
|
|
}
|