fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2024-12-12 14:55:32 +00:00
Code Issues Projects Releases Wiki Activity

get rid of acquire/release logic in waiting for the new Wasmer API

Browse Source
This commit is contained in:
vms 2020-05-24 18:44:06 +03:00
parent 5e8505c3e7
commit 2369a8131d
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vm/fce.rs
View File

@ -43,7 +43,7 @@ impl FCE {
/// Extracts ABI of a module into Namespace.
fn create_namespace_from_module(module: &FCEModule, config: &Config) -> Namespace {
let mut namespace = Namespace::new();
let module_abi = module.acquire_abi();
let module_abi = module.get_abi().clone();
// TODO: introduce a macro for such things
let allocate = module_abi.allocate;
@ -138,9 +138,6 @@ impl FCEService for FCE {
Entry::Vacant(_) => Err(FCEError::NoSuchModule),
Entry::Occupied(module) => {
if module.get().get_abi_ref_counter() != 0 {
return Err(FCEError::ModuleInUse);
}
module.remove_entry();
Ok(())
}

28
src/vm/module/fce_module.rs
View File

@ -21,7 +21,6 @@ use crate::vm::module::{ModuleABI, ModuleAPI};
use sha2::digest::generic_array::GenericArray;
use sha2::digest::FixedOutput;
use std::cell::RefCell;
use wasmer_runtime::{compile, func, imports, Ctx, Func, Instance};
use wasmer_runtime_core::import::ImportObject;
use wasmer_runtime_core::memory::ptr::{Array, WasmPtr};
@ -46,8 +45,6 @@ pub(crate) struct ABI {
pub(crate) struct FCEModule {
instance: Instance,
abi: ABI,
// due to the Wasmer architecture :(
abi_ref_counter: RefCell<i32>,
}
impl FCEModule {
@ -74,11 +71,7 @@ impl FCEModule {
let instance = compile(&wasm_bytes)?.instantiate(&import_object)?;
let abi = FCEModule::create_abi(&instance, &config_copy)?;
Ok(Self {
instance,
abi,
abi_ref_counter: RefCell::new(0),
})
Ok(Self { instance, abi })
}
#[rustfmt::skip]
@ -118,23 +111,8 @@ impl FCEModule {
/// Returns ABI of a module.
/// (!) Be carefull and delete all instances of ABI before dropping corresponding module.
/// There is no any internal ref counter due to the internals of Wasmer.
pub fn acquire_abi(&self) -> ABI {
use std::ops::AddAssign;
self.abi_ref_counter.borrow_mut().add_assign(1);
self.abi.clone()
}
pub fn release_abi(&self) {
if *self.abi_ref_counter.borrow() < 0 {
return;
}
use std::ops::SubAssign;
self.abi_ref_counter.borrow_mut().sub_assign(1);
}
pub fn get_abi_ref_counter(&self) -> i32 {
*self.abi_ref_counter.borrow()
pub fn get_abi(&self) -> &ABI {
&self.abi
}
/// Prints utf8 string of the given size from the given offset. Called from the wasm.