Merge pull request #5348 from igor-casper/core-205

[VM2] Move WasmerEnv's execution stack to context

Author: igor-casper

executor/wasm/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod install;
 
 use std::{
-    collections::{BTreeMap, BTreeSet, VecDeque},
+    collections::{BTreeMap, BTreeSet},
     sync::Arc,
 };
 
@@ -61,7 +61,6 @@ use casper_types::{
     NAME_FOR_V2_CONTRACT_MAIN_PURSE,
 };
 use install::{InstallContractError, InstallContractRequest, InstallContractResult};
-use parking_lot::RwLock;
 use tracing::{debug, error, warn};
 
 #[cfg(any(feature = "testing", test))]
@@ -187,7 +186,6 @@ impl ExecutorConfigBuilder {
 pub struct ExecutorV2 {
     config: ExecutorConfig,
     compiled_wasm_engine: Arc<WasmerEngine>,
-    execution_stack: Arc<RwLock<VecDeque<ExecutionKind>>>,
     execution_engine_v1: ExecutionEngineV1,
 }
 
@@ -590,6 +588,7 @@ impl ExecutorV2 {
             sandboxed,
             runtime_native_config,
             authorization_keys,
+            execution_stack,
         } = execute_request;
 
         let (entity_addr, source_purse) = get_purse_for_entity(&mut tracking_copy, caller_key)?;
@@ -998,6 +997,7 @@ impl ExecutorV2 {
             block_height,
             authorization_keys,
             ffi_call_costs,
+            execution_stack: Arc::clone(&execution_stack),
         };
 
         // Check that the input argument size does not exceed the VM memory limit
@@ -1023,10 +1023,16 @@ impl ExecutorV2 {
             .instantiate(wasm_bytes, self.clone(), context, wasm_instance_config)
             .map_err(ExecuteError::WasmPreparation)?;
 
-        self.push_execution_stack(execution_kind.clone());
+        {
+            let mut stack = execution_stack.write();
+            stack.push_back(execution_kind.clone());
+        }
         let (vm_result, gas_usage) = instance.call_export(export_name);
-
-        let top_execution_kind = self.pop_execution_stack().ok_or({
+        let top_execution_kind = {
+            let mut stack = execution_stack.write();
+            stack.pop_back()
+        }
+        .ok_or({
             //This shouldn't happen since we just pushed
             ExecuteError::Fatal(FatalHostError::CorruptExecutionState(
                 "Unexpected empty execution stack".to_owned(),
@@ -1393,22 +1399,9 @@ impl ExecutorV2 {
         ExecutorV2 {
             config,
             compiled_wasm_engine: Arc::new(wasm_engine),
-            execution_stack: Default::default(),
             execution_engine_v1,
         }
     }
-
-    /// Push the execution stack.
-    pub(crate) fn push_execution_stack(&self, execution_kind: ExecutionKind) {
-        let mut execution_stack = self.execution_stack.write();
-        execution_stack.push_back(execution_kind);
-    }
-
-    /// Pop the execution stack.
-    pub(crate) fn pop_execution_stack(&self) -> Option<ExecutionKind> {
-        let mut execution_stack = self.execution_stack.write();
-        execution_stack.pop_back()
-    }
 }
 
 impl Executor for ExecutorV2 {

executor/wasm_host/src/context.rs

@@ -1,9 +1,10 @@
 use std::{
-    collections::{BTreeMap, BTreeSet},
+    collections::{BTreeMap, BTreeSet, VecDeque},
     sync::Arc,
 };
 
 use bytes::Bytes;
+use casper_executor_wasm_interface::executor::ExecutionKind;
 use casper_storage::{
     global_state::GlobalStateReader, AddressGenerator, RuntimeNativeConfig, TrackingCopy,
 };
@@ -50,4 +51,6 @@ pub struct Context<S: GlobalStateReader> {
     pub authorization_keys: BTreeSet<AccountHash>,
     /// Map of ffi menu options to their respective cost entries
     pub ffi_call_costs: BTreeMap<u32, HostFFIFunctionCost>,
+    /// Shared execution stack across nested calls
+    pub execution_stack: Arc<RwLock<VecDeque<ExecutionKind>>>,
 }

executor/wasm_interface/src/executor.rs

@@ -1,4 +1,7 @@
-use std::{collections::BTreeSet, sync::Arc};
+use std::{
+    collections::{BTreeSet, VecDeque},
+    sync::Arc,
+};
 
 use borsh::BorshSerialize;
 use bytes::Bytes;
@@ -68,6 +71,8 @@ pub struct ExecuteRequest {
     pub runtime_native_config: RuntimeNativeConfig,
     /// Authorization keys for this execution.
     pub authorization_keys: BTreeSet<AccountHash>,
+    /// Shared execution stack across nested calls.
+    pub execution_stack: Arc<RwLock<VecDeque<ExecutionKind>>>,
 }
 
 /// Builder for `ExecuteRequest`.
@@ -89,6 +94,7 @@ pub struct ExecuteRequestBuilder {
     sandboxed: Option<bool>,
     runtime_native_config: Option<RuntimeNativeConfig>,
     authorization_keys: Option<BTreeSet<AccountHash>>,
+    execution_stack: Option<Arc<RwLock<VecDeque<ExecutionKind>>>>,
 }
 
 impl ExecuteRequestBuilder {
@@ -229,6 +235,15 @@ impl ExecuteRequestBuilder {
         self
     }
 
+    /// Set the shared execution stack used to track nested calls.
+    pub fn with_execution_stack(
+        mut self,
+        execution_stack: Arc<RwLock<VecDeque<ExecutionKind>>>,
+    ) -> Self {
+        self.execution_stack = Some(execution_stack);
+        self
+    }
+
     /// Build the `ExecuteRequest`.
     pub fn build(self) -> Result<ExecuteRequest, &'static str> {
         let initiator = self.initiator.ok_or("Initiator is not set")?;
@@ -255,6 +270,9 @@ impl ExecuteRequestBuilder {
         let authorization_keys = self
             .authorization_keys
             .ok_or("Authorization keys are not set")?;
+        let execution_stack = self
+            .execution_stack
+            .unwrap_or_else(|| Arc::new(RwLock::new(VecDeque::new())));
         Ok(ExecuteRequest {
             initiator,
             caller_key,
@@ -272,6 +290,7 @@ impl ExecuteRequestBuilder {
             sandboxed,
             runtime_native_config,
             authorization_keys,
+            execution_stack,
         })
     }
 }

executor/wasmer_backend/src/lib.rs

@@ -528,6 +528,7 @@ where
             block_height: data.context.block_height,
             authorization_keys: data.context.authorization_keys.clone(),
             ffi_call_costs: data.context.ffi_call_costs.clone(),
+            execution_stack: Arc::clone(&data.context.execution_stack),
         }
     }
 }