Merge pull request #4024 from wasmerio/wasmer-run-cache

Save compiled `*.wasm` files to the module cache when they are loaded directly
wasmerio · Jun 22, 2023 · 7201dec · 7201dec
2 parents 51e3365 + ebe590e
commit 7201dec
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/lib/cli/src/commands/run.rs b/lib/cli/src/commands/run.rs
@@ -585,8 +585,13 @@ impl ExecutableTarget {
                             );
                         }
 
-                        Module::new(&engine, &wasm)
-                            .with_context(|| format!("Unable to compile \"{}\"", path.display()))?
+                        let module = tracing::debug_span!("compiling_wasm")
+                            .in_scope(|| Module::new(&engine, &wasm))
+                            .with_context(|| format!("Unable to compile \"{}\"", path.display()))?;
+
+                        tasks.block_on(module_cache.save(module_hash, &engine, &module))?;
+
+                        module
                     }
                 };
 

diff --git a/lib/wasix/src/runtime/module_cache/filesystem.rs b/lib/wasix/src/runtime/module_cache/filesystem.rs
@@ -34,6 +34,7 @@ impl FileSystemCache {
 
 #[async_trait::async_trait]
 impl ModuleCache for FileSystemCache {
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn load(&self, key: ModuleHash, engine: &Engine) -> Result<Module, CacheError> {
         let path = self.path(key, engine.deterministic_id());
 
@@ -46,7 +47,10 @@ impl ModuleCache for FileSystemCache {
 
         let res = unsafe { Module::deserialize(&engine, uncompressed) };
         match res {
-            Ok(m) => Ok(m),
+            Ok(m) => {
+                tracing::debug!("Cache hit!");
+                Ok(m)
+            }
             Err(e) => {
                 tracing::debug!(
                     %key,
@@ -69,6 +73,7 @@ impl ModuleCache for FileSystemCache {
         }
     }
 
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn save(
         &self,
         key: ModuleHash,

diff --git a/lib/wasix/src/runtime/module_cache/shared.rs b/lib/wasix/src/runtime/module_cache/shared.rs
@@ -17,14 +17,21 @@ impl SharedCache {
 
 #[async_trait::async_trait]
 impl ModuleCache for SharedCache {
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn load(&self, key: ModuleHash, engine: &Engine) -> Result<Module, CacheError> {
         let key = (key, engine.deterministic_id().to_string());
-        self.modules
-            .get(&key)
-            .map(|m| m.value().clone())
-            .ok_or(CacheError::NotFound)
+
+        match self.modules.get(&key) {
+            Some(m) => {
+                tracing::debug!("Cache hit!");
+                Ok(m.value().clone())
+            }
+
+            None => Err(CacheError::NotFound),
+        }
     }
 
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn save(
         &self,
         key: ModuleHash,

diff --git a/lib/wasix/src/runtime/module_cache/thread_local.rs b/lib/wasix/src/runtime/module_cache/thread_local.rs
@@ -28,11 +28,18 @@ impl ThreadLocalCache {
 
 #[async_trait::async_trait]
 impl ModuleCache for ThreadLocalCache {
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn load(&self, key: ModuleHash, engine: &Engine) -> Result<Module, CacheError> {
-        self.lookup(key, engine.deterministic_id())
-            .ok_or(CacheError::NotFound)
+        match self.lookup(key, engine.deterministic_id()) {
+            Some(m) => {
+                tracing::debug!("Cache hit!");
+                Ok(m)
+            }
+            None => Err(CacheError::NotFound),
+        }
     }
 
+    #[tracing::instrument(level = "debug", skip_all, fields(%key))]
     async fn save(
         &self,
         key: ModuleHash,