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

Merge branch 'wasix-core-changes' into wasix

Browse Source
This commit is contained in:
Christoph Herzog
2022-12-22 11:17:38 +01:00
parent 6d227dbf38 6eba960593
commit 71cc16fa7a
14 changed files with 157 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/src/js/export.rs
View File

@@ -54,7 +54,7 @@ impl VMMemory {
}
/// Copies this memory to a new memory
pub fn fork(&self) -> Result<VMMemory, wasmer_types::MemoryError> {
pub fn duplicate(&self) -> Result<VMMemory, wasmer_types::MemoryError> {
let new_memory = crate::Memory::new_internal(self.ty.clone())?;
#[cfg(feature = "tracing")]

4
lib/api/src/js/externals/memory.rs vendored
View File

@@ -265,9 +265,9 @@ impl Memory {
}
/// Copies this memory to a new memory
pub fn fork(&mut self, store: &impl AsStoreRef) -> Result<VMMemory, MemoryError> {
pub fn duplicate(&mut self, store: &impl AsStoreRef) -> Result<VMMemory, MemoryError> {
let mem = self.handle.get(store.as_store_ref().objects());
mem.fork()
mem.duplicate()
}
}

4
lib/api/src/sys/tunables.rs
View File

@@ -117,10 +117,12 @@ mod tests {
.unwrap()
}
}
fn try_clone(&self) -> Option<Box<dyn LinearMemory + 'static>> {
None
}
fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
let mem = self.mem.clone();
Ok(Box::new(Self {
memory_definition: Some(UnsafeCell::new(VMMemoryDefinition {