Replace RefCell with Mutex

radixdlt · Nov 21, 2022 · d7b6cdc · d7b6cdc
1 parent 92966d0
commit d7b6cdc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/radix-engine/src/types.rs b/radix-engine/src/types.rs
@@ -28,6 +28,7 @@ pub use sbor::rust::rc::Rc;
 pub use sbor::rust::str::FromStr;
 pub use sbor::rust::string::String;
 pub use sbor::rust::string::ToString;
+pub use sbor::rust::sync::Mutex;
 pub use sbor::rust::vec;
 pub use sbor::rust::vec::Vec;
 pub use sbor::{Decode, DecodeError, Encode, SborPath, SborPathBuf, SborTypeId, SborValue, TypeId};

diff --git a/radix-engine/src/wasm/wasm_instrumenter.rs b/radix-engine/src/wasm/wasm_instrumenter.rs
@@ -6,7 +6,7 @@ use crate::wasm::{WasmMeteringConfig, WasmModule};
 
 pub struct WasmInstrumenter {
     #[cfg(not(feature = "moka"))]
-    cache: RefCell<lru::LruCache<(Hash, Hash), Arc<Vec<u8>>>>,
+    cache: Mutex<lru::LruCache<(Hash, Hash), Arc<Vec<u8>>>>,
     #[cfg(feature = "moka")]
     cache: moka::sync::Cache<(Hash, Hash), Arc<Vec<u8>>>,
 }
@@ -32,7 +32,8 @@ pub struct InstrumentedCode {
 impl WasmInstrumenter {
     pub fn new(options: InstrumenterOptions) -> Self {
         #[cfg(not(feature = "moka"))]
-        let cache = RefCell::new(lru::LruCache::new(
+        let cache = Mutex::new(lru::LruCache::new(
+            // TODO: bespoke LruCache implementation with custom size strategy
             NonZeroUsize::new(options.max_cache_size_bytes / (1024 * 1024)).unwrap(),
         ));
         #[cfg(feature = "moka")]
@@ -60,7 +61,7 @@ impl WasmInstrumenter {
 
         #[cfg(not(feature = "moka"))]
         {
-            if let Some(cached) = self.cache.borrow_mut().get(&cache_key) {
+            if let Some(cached) = self.cache.lock().unwrap().get(&cache_key) {
                 return InstrumentedCode {
                     code: cached.clone(),
                     code_hash,
@@ -79,7 +80,8 @@ impl WasmInstrumenter {
 
         #[cfg(not(feature = "moka"))]
         self.cache
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .put(cache_key, instrumented_ref.clone());
         #[cfg(feature = "moka")]
         self.cache.insert(cache_key, instrumented_ref.clone());

diff --git a/radix-engine/src/wasm/wasmer.rs b/radix-engine/src/wasm/wasmer.rs
@@ -37,7 +37,7 @@ pub struct WasmerInstanceEnv {
 pub struct WasmerEngine {
     store: Store,
     #[cfg(not(feature = "moka"))]
-    modules_cache: RefCell<lru::LruCache<Hash, Arc<WasmerModule>>>,
+    modules_cache: Mutex<lru::LruCache<Hash, Arc<WasmerModule>>>,
     #[cfg(feature = "moka")]
     modules_cache: moka::sync::Cache<Hash, Arc<WasmerModule>>,
 }
@@ -239,7 +239,8 @@ impl WasmerEngine {
     pub fn new(options: EngineOptions) -> Self {
         let compiler = Singlepass::new();
         #[cfg(not(feature = "moka"))]
-        let modules_cache = RefCell::new(lru::LruCache::new(
+        let modules_cache = Mutex::new(lru::LruCache::new(
+            // TODO: bespoke LruCache implementation with custom size strategy
             NonZeroUsize::new(options.max_cache_size_bytes / (1024 * 1024)).unwrap(),
         ));
         #[cfg(feature = "moka")]
@@ -264,7 +265,7 @@ impl WasmEngine for WasmerEngine {
         let code_hash = &instrumented_code.code_hash;
         #[cfg(not(feature = "moka"))]
         {
-            if let Some(cached_module) = self.modules_cache.borrow_mut().get(code_hash) {
+            if let Some(cached_module) = self.modules_cache.lock().unwrap().get(code_hash) {
                 return cached_module.instantiate();
             }
         }
@@ -282,7 +283,8 @@ impl WasmEngine for WasmerEngine {
 
         #[cfg(not(feature = "moka"))]
         self.modules_cache
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .put(*code_hash, new_module.clone());
         #[cfg(feature = "moka")]
         self.modules_cache.insert(*code_hash, new_module.clone());

diff --git a/radix-engine/src/wasm/wasmi.rs b/radix-engine/src/wasm/wasmi.rs
@@ -220,7 +220,7 @@ pub struct EngineOptions {
 
 pub struct WasmiEngine {
     #[cfg(not(feature = "moka"))]
-    modules_cache: RefCell<lru::LruCache<Hash, Arc<WasmiModule>>>,
+    modules_cache: Mutex<lru::LruCache<Hash, Arc<WasmiModule>>>,
     #[cfg(feature = "moka")]
     modules_cache: moka::sync::Cache<Hash, Arc<WasmiModule>>,
 }
@@ -236,7 +236,8 @@ impl Default for WasmiEngine {
 impl WasmiEngine {
     pub fn new(options: EngineOptions) -> Self {
         #[cfg(not(feature = "moka"))]
-        let modules_cache = RefCell::new(lru::LruCache::new(
+        let modules_cache = Mutex::new(lru::LruCache::new(
+            // TODO: bespoke LruCache implementation with custom size strategy
             NonZeroUsize::new(options.max_cache_size_bytes / (1024 * 1024)).unwrap(),
         ));
         #[cfg(feature = "moka")]
@@ -259,7 +260,7 @@ impl WasmEngine for WasmiEngine {
 
         #[cfg(not(feature = "moka"))]
         {
-            if let Some(cached_module) = self.modules_cache.borrow_mut().get(code_hash) {
+            if let Some(cached_module) = self.modules_cache.lock().unwrap().get(code_hash) {
                 return cached_module.instantiate();
             }
         }
@@ -277,7 +278,8 @@ impl WasmEngine for WasmiEngine {
 
         #[cfg(not(feature = "moka"))]
         self.modules_cache
-            .borrow_mut()
+            .lock()
+            .unwrap()
             .put(*code_hash, new_module.clone());
         #[cfg(feature = "moka")]
         self.modules_cache.insert(*code_hash, new_module.clone());