feat: Implement MemoryUsage for Store

Cargo.toml

@@ -69,6 +69,7 @@ criterion = "0.3"
 lazy_static = "1.4"
 wasmer-engine-dummy = { path = "tests/lib/engine-dummy" }
 tempfile = "3.1"
+loupe = { git = "https://github.com/wasmerio/loupe", branch = "master" }
 
 [features]
 # Don't add the compiler features in default, please add them on the Makefile

examples/tunables_limit_memory.rs

@@ -1,6 +1,8 @@
+use std::mem;
 use std::ptr::NonNull;
 use std::sync::Arc;
 
+use loupe::{MemoryUsage, MemoryUsageTracker};
 use wasmer::{
     imports,
     vm::{self, MemoryError, MemoryStyle, TableStyle, VMMemoryDefinition, VMTableDefinition},
@@ -131,6 +133,12 @@ impl<T: Tunables> Tunables for LimitingTunables<T> {
     }
 }
 
+impl<T: Tunables> MemoryUsage for LimitingTunables<T> {
+    fn size_of_val(&self, _tracker: &mut dyn MemoryUsageTracker) -> usize {
+        mem::size_of_val(self)
+    }
+}
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // A Wasm module with one exported memory (min: 7 pages, max: unset)
     let wat = br#"(module (memory 7) (export "memory" (memory 0)))"#;

lib/api/Cargo.toml

@@ -27,6 +27,7 @@ wat = { version = "1.0", optional = true }
 thiserror = "1.0"
 more-asserts = "0.2"
 target-lexicon = { version = "0.11", default-features = false }
+loupe = { git = "https://github.com/wasmerio/loupe", branch = "master" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = "0.3"

lib/api/src/store.rs

@@ -1,4 +1,5 @@
 use crate::tunables::BaseTunables;
+use loupe::MemoryUsage;
 use std::fmt;
 use std::sync::Arc;
 #[cfg(all(feature = "compiler", feature = "engine"))]
@@ -15,7 +16,7 @@ use wasmer_engine::{Engine, Tunables};
 /// [`Tunables`] (that are used to create the memories, tables and globals).
 ///
 /// Spec: <https://webassembly.github.io/spec/core/exec/runtime.html#store>
-#[derive(Clone)]
+#[derive(Clone, MemoryUsage)]
 pub struct Store {
     engine: Arc<dyn Engine + Send + Sync>,
     tunables: Arc<dyn Tunables + Send + Sync>,

lib/api/src/tunables.rs

@@ -1,4 +1,5 @@
 use crate::{MemoryType, Pages, TableType};
+use loupe::MemoryUsage;
 use std::cmp::min;
 use std::ptr::NonNull;
 use std::sync::Arc;
@@ -19,7 +20,7 @@ use wasmer_vm::{
 /// implementation or use composition to wrap your Tunables around
 /// this one. The later approach is demonstrated in the
 /// tunables-limit-memory example.
-#[derive(Clone)]
+#[derive(Clone, MemoryUsage)]
 pub struct BaseTunables {
     /// For static heaps, the size in wasm pages of the heap protected by bounds checking.
     pub static_memory_bound: Pages,

lib/compiler-cranelift/Cargo.toml

@@ -25,6 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 more-asserts = "0.2"
 gimli = { version = "0.23", optional = true }
 smallvec = "1.6"
+loupe = { git = "https://github.com/wasmerio/loupe", branch = "master" }
 
 [dev-dependencies]
 target-lexicon = { version = "0.11", default-features = false }

lib/compiler-cranelift/src/compiler.rs

@@ -18,6 +18,7 @@ use cranelift_codegen::print_errors::pretty_error;
 use cranelift_codegen::{binemit, Context};
 #[cfg(feature = "unwind")]
 use gimli::write::{Address, EhFrame, FrameTable};
+use loupe::MemoryUsage;
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 use std::sync::Arc;
 use wasmer_compiler::CompileError;
@@ -32,6 +33,7 @@ use wasmer_types::{FunctionIndex, LocalFunctionIndex, SignatureIndex};
 
 /// A compiler that compiles a WebAssembly module with Cranelift, translating the Wasm to Cranelift IR,
 /// optimizing it and then translating to assembly.
+#[derive(MemoryUsage)]
 pub struct CraneliftCompiler {
     config: Cranelift,
 }