try to make diff smaller

infinyon · xxchan · Feb 26, 2023 · Feb 26, 2023 · Apr 9, 2023 · Feb 26, 2023
commit fe98b8f391ecaab1aff1ce47b93aad947be66d89
diff --git a/...io-smartengine/src/engine/wasmtime/imp.rs → ...smartengine/src/engine/wasmtime/engine.rs b/...io-smartengine/src/engine/wasmtime/imp.rs → ...smartengine/src/engine/wasmtime/engine.rs
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/instance.rs b/crates/fluvio-smartengine/src/engine/wasmtime/instance.rs
@@ -1,17 +1,16 @@
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
 use anyhow::Result;
 use fluvio_protocol::{Decoder, Encoder};
 use tracing::debug;
 use fluvio_smartmodule::dataplane::smartmodule::SmartModuleExtraParams;
-use wasmtime::{AsContext, Caller, Extern, Instance, Module};
+use wasmtime::{AsContext, Caller, Extern, Instance, Module, Memory};
 
 use crate::engine::{
     common::{WasmFn, WasmInstance},
     error::EngineError,
-    wasmtime::memory::RecordsMemory,
 };
-use super::{memory::RecordsCallBack, state::WasmState};
+use super::state::WasmState;
 
 pub struct WasmtimeInstance {
     instance: Instance,
@@ -123,3 +122,41 @@ impl WasmtimeInstance {
         })
     }
 }
+
+#[derive(Clone)]
+pub struct RecordsMemory {
+    pub ptr: i32,
+    pub len: i32,
+    pub memory: Memory,
+}
+
+impl RecordsMemory {
+    pub fn copy_memory_from(&self, store: impl AsContext) -> Result<Vec<u8>> {
+        let mut bytes = vec![0u8; self.len as u32 as usize];
+        self.memory.read(store, self.ptr as usize, &mut bytes)?;
+        Ok(bytes)
+    }
+}
+
+pub struct RecordsCallBack(Mutex<Option<RecordsMemory>>);
+
+impl RecordsCallBack {
+    pub(crate) fn new() -> Self {
+        Self(Mutex::new(None))
+    }
+
+    pub(crate) fn set(&self, records: RecordsMemory) {
+        let mut write_inner = self.0.lock().unwrap();
+        write_inner.replace(records);
+    }
+
+    pub(crate) fn clear(&self) {
+        let mut write_inner = self.0.lock().unwrap();
+        write_inner.take();
+    }
+
+    pub(crate) fn get(&self) -> Option<RecordsMemory> {
+        let reader = self.0.lock().unwrap();
+        reader.clone()
+    }
+}
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/memory.rs b/crates/fluvio-smartengine/src/engine/wasmtime/memory.rs
@@ -1,5 +1,3 @@
-use std::sync::Mutex;
-
 use wasmtime::*;
 use anyhow::{anyhow, Error, Result};
 
@@ -56,41 +54,3 @@ pub(crate) fn copy_memory_to_instance(
 
     Ok(guest_ptr_offset)
 }
-
-#[derive(Clone)]
-pub struct RecordsMemory {
-    pub ptr: i32,
-    pub len: i32,
-    pub memory: Memory,
-}
-
-impl RecordsMemory {
-    pub fn copy_memory_from(&self, store: impl AsContext) -> Result<Vec<u8>> {
-        let mut bytes = vec![0u8; self.len as u32 as usize];
-        self.memory.read(store, self.ptr as usize, &mut bytes)?;
-        Ok(bytes)
-    }
-}
-
-pub struct RecordsCallBack(Mutex<Option<RecordsMemory>>);
-
-impl RecordsCallBack {
-    pub(crate) fn new() -> Self {
-        Self(Mutex::new(None))
-    }
-
-    pub(crate) fn set(&self, records: RecordsMemory) {
-        let mut write_inner = self.0.lock().unwrap();
-        write_inner.replace(records);
-    }
-
-    pub(crate) fn clear(&self) {
-        let mut write_inner = self.0.lock().unwrap();
-        write_inner.take();
-    }
-
-    pub(crate) fn get(&self) -> Option<RecordsMemory> {
-        let reader = self.0.lock().unwrap();
-        reader.clone()
-    }
-}
diff --git a/crates/fluvio-smartengine/src/engine/wasmtime/mod.rs b/crates/fluvio-smartengine/src/engine/wasmtime/mod.rs
@@ -1,6 +1,6 @@
 /// Implementations of the public API
-mod imp;
-pub use imp::{initialize_imp, SmartEngineImp, SmartModuleChainInstanceImp};
+mod engine;
+pub use engine::{initialize_imp, SmartEngineImp, SmartModuleChainInstanceImp};
 /// Implementations of the traits in `common` for the Wasmtime engine
 mod instance;
 #[cfg(test)]