fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2025-03-15 14:00:50 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to narrow unsafe impl Send down to FluenceFaaS only

Browse Source
This commit is contained in:
folex 2020-12-25 14:40:41 +03:00
parent e3f66d0ecd
commit 8280b7ec2f
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aquamarine-vm/src/aquamarine_stepper_vm.rs
View File

@ -27,13 +27,27 @@ use stepper_interface::StepperOutcome;
use std::path::PathBuf; use std::path::PathBuf;
use std::cell::{RefCell}; use std::cell::{RefCell};
use std::rc::Rc; use std::rc::Rc;
use std::ops::Deref; use std::ops::{Deref, DerefMut};
use std::borrow::Cow; use std::borrow::Cow;
const CALL_SERVICE_NAME: &str = "call_service"; const CALL_SERVICE_NAME: &str = "call_service";
const CURRENT_PEER_ID_ENV_NAME: &str = "CURRENT_PEER_ID"; const CURRENT_PEER_ID_ENV_NAME: &str = "CURRENT_PEER_ID";
unsafe impl Send for AquamarineVM {} unsafe impl Send for SendSafeFaaS {}
struct SendSafeFaaS(FluenceFaaS);
impl Deref for SendSafeFaaS {
type Target = FluenceFaaS;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl DerefMut for SendSafeFaaS {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.0
}
}
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct ParticleParams { pub struct ParticleParams {
@ -42,7 +56,7 @@ pub struct ParticleParams {
} }
pub struct AquamarineVM { pub struct AquamarineVM {
faas: FluenceFaaS, faas: SendSafeFaaS,
particle_data_store: PathBuf, particle_data_store: PathBuf,
/// file name of the AIR interpreter .wasm /// file name of the AIR interpreter .wasm
wasm_filename: String, wasm_filename: String,
@ -92,7 +106,7 @@ impl AquamarineVM {
.map_err(|e| InvalidDataStorePath(e, particle_data_store.clone()))?; .map_err(|e| InvalidDataStorePath(e, particle_data_store.clone()))?;
let aqua_vm = Self { let aqua_vm = Self {
faas, faas: SendSafeFaaS(faas),
particle_data_store, particle_data_store,
wasm_filename, wasm_filename,
current_particle, current_particle,