Fix Missing WaiterError export + Add notify/wait to fd_mmap memory

lib/sys-utils/Cargo.toml

@@ -14,6 +14,7 @@ wasmer = { path = "../api", version = "=3.2.1", default-features = false, featur
 wasmer-vm = { path = "../vm", version = "=3.2.1" }
 wasmer-types = { path = "../types", version = "=3.2.1" }
 region = { version = "3.0" }
+tracing = "0.1.37"
 
 [target.'cfg(unix)'.dependencies]
 libc = { version = "^0.2", default-features = false }

lib/sys-utils/src/memory/fd_memory/memories.rs

@@ -13,7 +13,9 @@ use std::{
 
 use wasmer::{Bytes, MemoryError, MemoryType, Pages};
 use wasmer_types::MemoryStyle;
-use wasmer_vm::{LinearMemory, MaybeInstanceOwned, Trap, VMMemoryDefinition};
+use wasmer_vm::{
+    LinearMemory, MaybeInstanceOwned, ThreadConditions, Trap, VMMemoryDefinition, WaiterError,
+};
 
 use super::fd_mmap::FdMmap;
 
@@ -297,6 +299,7 @@ impl VMOwnedMemory {
         VMSharedMemory {
             mmap: Arc::new(RwLock::new(self.mmap)),
             config: self.config,
+            conditions: ThreadConditions::new(),
         }
     }
 
@@ -341,6 +344,7 @@ impl LinearMemory for VMOwnedMemory {
 
     /// Owned memory can not be cloned (this will always return None)
     fn try_clone(&self) -> Option<Box<dyn LinearMemory + 'static>> {
+        tracing::warn!("trying to clone owned memory");
         None
     }
 
@@ -358,6 +362,7 @@ pub struct VMSharedMemory {
     mmap: Arc<RwLock<WasmMmap>>,
     // Configuration of this memory
     config: VMMemoryConfig,
+    conditions: ThreadConditions,
 }
 
 unsafe impl Send for VMSharedMemory {}
@@ -393,6 +398,7 @@ impl VMSharedMemory {
         Ok(Self {
             mmap: Arc::new(RwLock::new(guard.duplicate()?)),
             config: self.config.clone(),
+            conditions: ThreadConditions::new(),
         })
     }
 }
@@ -443,6 +449,18 @@ impl LinearMemory for VMSharedMemory {
         let forked = Self::duplicate(self)?;
         Ok(Box::new(forked))
     }
+
+    fn do_wait(
+        &mut self,
+        dst: wasmer_vm::NotifyLocation,
+        timeout: Option<std::time::Duration>,
+    ) -> Result<u32, WaiterError> {
+        self.conditions.do_wait(dst, timeout)
+    }
+
+    fn do_notify(&mut self, dst: wasmer_vm::NotifyLocation, count: u32) -> u32 {
+        self.conditions.do_notify(dst, count)
+    }
 }
 
 impl From<VMOwnedMemory> for VMMemory {

lib/vm/src/lib.rs

@@ -56,6 +56,9 @@ pub use crate::probestack::PROBESTACK;
 pub use crate::sig_registry::SignatureRegistry;
 pub use crate::store::{InternalStoreHandle, MaybeInstanceOwned, StoreHandle, StoreObjects};
 pub use crate::table::{TableElement, VMTable};
+#[doc(hidden)]
+pub use crate::threadconditions::ThreadConditions;
+pub use crate::threadconditions::WaiterError;
 pub use crate::trap::*;
 pub use crate::vmcontext::{
     VMCallerCheckedAnyfunc, VMContext, VMDynamicFunctionContext, VMFunctionContext,

lib/vm/src/threadconditions.rs

@@ -5,8 +5,10 @@ use std::thread::{current, park, park_timeout, Thread};
 use std::time::Duration;
 use thiserror::Error;
 
-/// Wait/Notify error type
+/// Error that can occur during wait/notify calls.
 #[derive(Debug, Error)]
+// Non-exhaustive to allow for future variants without breaking changes!
+#[non_exhaustive]
 pub enum WaiterError {
     /// Wait/Notify is not implemented for this memory
     Unimplemented,