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

Rename fork() to duplicate()

Browse Source 
Renames all the memory fork() functions to duplicate(),
since this is what they actually do.

They enable forking, but that is a seprate functionality.
This commit is contained in:
Christoph Herzog
2022-12-19 18:04:00 +01:00
parent 11774ee5b4
commit 9c12b87eb0
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/vm/src/memory.rs
View File

@@ -119,11 +119,11 @@ impl WasmMmap {
/// Copies the memory
/// (in this case it performs a copy-on-write to save memory)
pub fn fork(&mut self) -> Result<Self, MemoryError> {
pub fn duplicate(&mut self) -> Result<Self, MemoryError> {
let mem_length = self.size.bytes().0;
let mut alloc = self
.alloc
.fork(Some(mem_length))
.duplicate(Some(mem_length))
.map_err(MemoryError::Generic)?;
let base_ptr = alloc.as_mut_ptr();
Ok(Self {
@@ -289,9 +289,9 @@ impl VMOwnedMemory {
}
/// Copies this memory to a new memory
pub fn fork(&mut self) -> Result<Self, MemoryError> {
pub fn duplicate(&mut self) -> Result<Self, MemoryError> {
Ok(Self {
mmap: self.mmap.fork()?,
mmap: self.mmap.duplicate()?,
config: self.config.clone(),
})
}
@@ -333,8 +333,8 @@ impl LinearMemory for VMOwnedMemory {
}
/// Copies this memory to a new memory
fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
let forked = Self::fork(self)?;
fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
let forked = Self::duplicate(self)?;
Ok(Box::new(forked))
}
}
@@ -376,10 +376,10 @@ impl VMSharedMemory {
}
/// Copies this memory to a new memory
pub fn fork(&mut self) -> Result<Self, MemoryError> {
pub fn duplicate(&mut self) -> Result<Self, MemoryError> {
let mut guard = self.mmap.write().unwrap();
Ok(Self {
mmap: Arc::new(RwLock::new(guard.fork()?)),
mmap: Arc::new(RwLock::new(guard.duplicate()?)),
config: self.config.clone(),
})
}
@@ -427,8 +427,8 @@ impl LinearMemory for VMSharedMemory {
}
/// Copies this memory to a new memory
fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
let forked = Self::fork(self)?;
fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
let forked = Self::duplicate(self)?;
Ok(Box::new(forked))
}
}
@@ -495,8 +495,8 @@ impl LinearMemory for VMMemory {
}
/// Copies this memory to a new memory
fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
self.0.fork()
fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
self.0.duplicate()
}
}
@@ -558,8 +558,8 @@ impl VMMemory {
}
/// Copies this memory to a new memory
pub fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
LinearMemory::fork(self)
pub fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError> {
LinearMemory::duplicate(self)
}
}
@@ -615,5 +615,5 @@ where
}
/// Copies this memory to a new memory
fn fork(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError>;
fn duplicate(&mut self) -> Result<Box<dyn LinearMemory + 'static>, MemoryError>;
}