-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #873 from Hywan/feature/wasi-in-c-api
Update feature/wasi-in-c-api
- Loading branch information
Showing
3 changed files
with
109 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| use super::*; | ||
| use crate::get_slice_checked; | ||
| use std::path::PathBuf; | ||
|
|
||
| /// Opens a directory that's visible to the WASI module as `alias` but | ||
| /// is backed by the host file at `host_file_path` | ||
| #[repr(C)] | ||
| pub struct wasmer_wasi_map_dir_entry_t { | ||
| /// What the WASI module will see in its virtual root | ||
| pub alias: wasmer_byte_array, | ||
| /// The backing file that the WASI module will interact with via the alias | ||
| pub host_file_path: wasmer_byte_array, | ||
| } | ||
|
|
||
| impl wasmer_wasi_map_dir_entry_t { | ||
| /// Converts the data into owned, Rust types | ||
| pub unsafe fn as_tuple(&self) -> Result<(String, PathBuf), std::str::Utf8Error> { | ||
| let alias = self.alias.as_str()?.to_owned(); | ||
| let host_path = std::path::PathBuf::from(self.host_file_path.as_str()?); | ||
|
|
||
| Ok((alias, host_path)) | ||
| } | ||
| } | ||
|
|
||
| /// Creates a WASI import object. | ||
| /// | ||
| /// This function treats null pointers as empty collections. | ||
| /// For example, passing null for a string in `args`, will lead to a zero | ||
| /// length argument in that position. | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn wasmer_wasi_generate_import_object( | ||
| args: *const wasmer_byte_array, | ||
| args_len: c_uint, | ||
| envs: *const wasmer_byte_array, | ||
| envs_len: c_uint, | ||
| preopened_files: *const wasmer_byte_array, | ||
| preopened_files_len: c_uint, | ||
| mapped_dirs: *const wasmer_wasi_map_dir_entry_t, | ||
| mapped_dirs_len: c_uint, | ||
| ) -> *mut wasmer_import_object_t { | ||
| let arg_list = get_slice_checked(args, args_len as usize); | ||
| let env_list = get_slice_checked(envs, envs_len as usize); | ||
| let preopened_file_list = get_slice_checked(preopened_files, preopened_files_len as usize); | ||
| let mapped_dir_list = get_slice_checked(mapped_dirs, mapped_dirs_len as usize); | ||
|
|
||
| wasmer_wasi_generate_import_object_inner( | ||
| arg_list, | ||
| env_list, | ||
| preopened_file_list, | ||
| mapped_dir_list, | ||
| ) | ||
| .unwrap_or(std::ptr::null_mut()) | ||
| } | ||
|
|
||
| /// Inner function that wraps error handling | ||
| fn wasmer_wasi_generate_import_object_inner( | ||
| arg_list: &[wasmer_byte_array], | ||
| env_list: &[wasmer_byte_array], | ||
| preopened_file_list: &[wasmer_byte_array], | ||
| mapped_dir_list: &[wasmer_wasi_map_dir_entry_t], | ||
| ) -> Result<*mut wasmer_import_object_t, std::str::Utf8Error> { | ||
| let arg_vec = arg_list.iter().map(|arg| unsafe { arg.as_vec() }).collect(); | ||
| let env_vec = env_list | ||
| .iter() | ||
| .map(|env_var| unsafe { env_var.as_vec() }) | ||
| .collect(); | ||
| let po_file_vec = preopened_file_list | ||
| .iter() | ||
| .map(|po_file| Ok(unsafe { PathBuf::from(po_file.as_str()?) }.to_owned())) | ||
| .collect::<Result<Vec<_>, _>>()?; | ||
| let mapped_dir_vec = mapped_dir_list | ||
| .iter() | ||
| .map(|entry| unsafe { entry.as_tuple() }) | ||
| .collect::<Result<Vec<_>, _>>()?; | ||
|
|
||
| let import_object = Box::new(wasmer_wasi::generate_import_object( | ||
| arg_vec, | ||
| env_vec, | ||
| po_file_vec, | ||
| mapped_dir_vec, | ||
| )); | ||
| Ok(Box::into_raw(import_object) as *mut wasmer_import_object_t) | ||
| } | ||
|
|
||
| /// Convenience function that creates a WASI import object with no arguments, | ||
| /// environment variables, preopened files, or mapped directories. | ||
| /// | ||
| /// This function is the same as calling [`wasmer_wasi_generate_import_object`] with all | ||
| /// empty values. | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn wasmer_wasi_generate_default_import_object() -> *mut wasmer_import_object_t | ||
| { | ||
| let import_object = Box::new(wasmer_wasi::generate_import_object( | ||
| vec![], | ||
| vec![], | ||
| vec![], | ||
| vec![], | ||
| )); | ||
|
|
||
| Box::into_raw(import_object) as *mut wasmer_import_object_t | ||
| } |