mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 05:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement console_io_memory using wasi::Pipe

Browse Source
This commit is contained in:
Felix Schütt
2022-08-18 10:48:41 +02:00
parent df0567900c
commit 662be61c15
1 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/c-api/src/wasm_c_api/wasi/mod.rs
View File

@@ -354,6 +354,7 @@ unsafe extern "C" fn wasi_console_out_read_memory(
byte_ptr: *mut c_char, /* &[u8] bytes to read */ byte_ptr: *mut c_char, /* &[u8] bytes to read */
max_bytes: usize, /* max bytes to read */ max_bytes: usize, /* max bytes to read */
) -> i64 { ) -> i64 {
use std::io::Read;
if sizeof != std::mem::size_of::<Pipe>() if sizeof != std::mem::size_of::<Pipe>()
|| alignof != std::mem::align_of::<Pipe>() || alignof != std::mem::align_of::<Pipe>()
{ {
@@ -361,17 +362,11 @@ unsafe extern "C" fn wasi_console_out_read_memory(
} }
let ptr = ptr as *mut Pipe; let ptr = ptr as *mut Pipe;
let ptr = &mut *ptr; let ptr = &mut *ptr;
/* let slice = std::slice::from_raw_parts_mut(byte_ptr as *mut u8, max_bytes);
let read_slice = &ptr.backed[ptr.cursor..]; match ptr.read(slice) {
let byte_ptr = byte_ptr as *mut u8; Ok(o) => o as i64,
let write_slice = std::slice::from_raw_parts_mut(byte_ptr, max_bytes); Err(_) => -1,
let read = read_slice.len().min(write_slice.len());
for (source, target) in read_slice.iter().zip(write_slice.iter_mut()) {
*target = *source;
} }
ptr.cursor += read;
read as i64
*/
} }
unsafe extern "C" fn wasi_console_out_write_memory( unsafe extern "C" fn wasi_console_out_write_memory(
@@ -382,25 +377,28 @@ unsafe extern "C" fn wasi_console_out_write_memory(
byte_len: usize, byte_len: usize,
flush: bool, flush: bool,
) -> i64 { ) -> i64 {
use std::io::Write;
if sizeof != std::mem::size_of::<Pipe>() if sizeof != std::mem::size_of::<Pipe>()
|| alignof != std::mem::align_of::<Pipe>() || alignof != std::mem::align_of::<Pipe>()
{ {
return -1; return -1;
} }
let ptr = ptr as *mut Pipe; let ptr = ptr as *mut Pipe;
let ptr = &mut *ptr; let ptr = &mut *ptr;
/*
if flush { if flush {
return 0; match ptr.flush() {
Ok(()) => 0,
Err(_) => -1,
}
} else {
let slice = std::slice::from_raw_parts(byte_ptr as *const u8, byte_len);
match ptr.write(slice) {
Ok(o) => o as i64,
Err(_) => -1,
}
} }
let byte_ptr = byte_ptr as *const u8;
let read_slice = std::slice::from_raw_parts(byte_ptr, byte_len);
ptr.backed.extend_from_slice(read_slice);
read_slice.len() as i64
*/
} }
unsafe extern "C" fn wasi_console_out_seek_memory( unsafe extern "C" fn wasi_console_out_seek_memory(
@@ -410,40 +408,26 @@ unsafe extern "C" fn wasi_console_out_seek_memory(
direction: c_char, direction: c_char,
seek_to: i64, seek_to: i64,
) -> i64 { ) -> i64 {
use std::io::Seek;
if sizeof != std::mem::size_of::<Pipe>() if sizeof != std::mem::size_of::<Pipe>()
|| alignof != std::mem::align_of::<Pipe>() || alignof != std::mem::align_of::<Pipe>()
{ {
return -1; return -1;
} }
let ptr = ptr as *mut Pipe; let ptr = ptr as *mut Pipe;
let ptr = &mut *ptr; let ptr = &mut *ptr;
if direction == 0 { let seek_from = match direction {
/* 0 => std::io::SeekFrom::Start(seek_to.max(0) as u64),
// seek from start 1 => std::io::SeekFrom::End(seek_to),
let seek_to = (seek_to.max(0_i64) as usize).min(ptr.backed.len()); 2 => std::io::SeekFrom::Current(seek_to),
let diff = ptr.cursor as i64 - seek_to as i64; _ => { return -1; },
ptr.cursor = seek_to; };
diff*/
} else if direction == 1 { match ptr.seek(seek_from) {
/* Ok(o) => o as i64,
// seek from end Err(_) => -1,
let seek_to = ptr.backed.len() as i64 + seek_to;
let seek_to = (seek_to.max(0_i64) as usize).min(ptr.backed.len());
let diff = ptr.cursor as i64 - seek_to as i64;
ptr.cursor = seek_to;
diff*/
} else if direction == 2 {
// seek from cursor
/*
let seek_to = ptr.cursor as i64 + seek_to;
let seek_to = (seek_to.max(0_i64) as usize).min(ptr.backed.len());
let diff = ptr.cursor as i64 - seek_to as i64;
ptr.cursor = seek_to;
diff
*/
} else {
-1
} }
} }