From 64c1f083fc7db90381f5366abf6ce787788efe1c Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Mon, 22 Mar 2021 16:06:58 +0100 Subject: [PATCH] feat: Use latest version of `loupe`. --- Cargo.toml | 1 - lib/api/src/exports.rs | 2 +- lib/api/src/externals/function.rs | 4 ++-- lib/api/src/externals/global.rs | 2 +- lib/api/src/externals/memory.rs | 2 +- lib/api/src/externals/mod.rs | 2 +- lib/api/src/externals/table.rs | 2 +- lib/api/src/instance.rs | 2 +- lib/compiler/src/target.rs | 2 +- lib/engine-native/src/engine.rs | 2 +- lib/engine/src/export.rs | 8 ++++---- lib/vm/src/export.rs | 4 ++-- lib/vm/src/instance/mod.rs | 7 +++---- lib/vm/src/vmoffsets.rs | 2 +- 14 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ec82f97da7e..7bd6fe8427a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,6 @@ wasmer-cache = { version = "1.0.2", path = "lib/cache", optional = true } wasmer-types = { version = "1.0.2", path = "lib/wasmer-types" } wasmer-middlewares = { version = "1.0.2", path = "lib/middlewares", optional = true } cfg-if = "1.0" -loupe = { path = "../loupe/crates/loupe" } [workspace] members = [ diff --git a/lib/api/src/exports.rs b/lib/api/src/exports.rs index 13082248f42..4bfea97ede7 100644 --- a/lib/api/src/exports.rs +++ b/lib/api/src/exports.rs @@ -3,7 +3,7 @@ use crate::import_object::LikeNamespace; use crate::native::NativeFunc; use crate::WasmTypeList; use indexmap::IndexMap; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt; use std::iter::{ExactSizeIterator, FromIterator}; use std::sync::Arc; diff --git a/lib/api/src/externals/function.rs b/lib/api/src/externals/function.rs index 889b8f37578..a396c1ca2c2 100644 --- a/lib/api/src/externals/function.rs +++ b/lib/api/src/externals/function.rs @@ -10,7 +10,7 @@ pub use inner::{FromToNativeWasmType, HostFunction, WasmTypeList, WithEnv, Witho #[cfg(feature = "deprecated")] pub use inner::{UnsafeMutableEnv, WithUnsafeMutableEnv}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::cmp::max; use std::ffi::c_void; use std::fmt; @@ -26,7 +26,7 @@ use wasmer_vm::{ #[derive(Clone, PartialEq, MemoryUsage)] pub struct WasmFunctionDefinition { // Address of the trampoline to do the call. - #[memoryusage(ignore)] + #[loupe(skip)] pub(crate) trampoline: VMTrampoline, } diff --git a/lib/api/src/externals/global.rs b/lib/api/src/externals/global.rs index 2f7ce83f78b..4f85aba5db6 100644 --- a/lib/api/src/externals/global.rs +++ b/lib/api/src/externals/global.rs @@ -5,7 +5,7 @@ use crate::types::Val; use crate::GlobalType; use crate::Mutability; use crate::RuntimeError; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt; use std::sync::Arc; use wasmer_engine::{Export, ExportGlobal}; diff --git a/lib/api/src/externals/memory.rs b/lib/api/src/externals/memory.rs index e140c1e5fba..8cfe9f876b3 100644 --- a/lib/api/src/externals/memory.rs +++ b/lib/api/src/externals/memory.rs @@ -2,7 +2,7 @@ use crate::exports::{ExportError, Exportable}; use crate::externals::Extern; use crate::store::Store; use crate::{MemoryType, MemoryView}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::convert::TryInto; use std::slice; use std::sync::Arc; diff --git a/lib/api/src/externals/mod.rs b/lib/api/src/externals/mod.rs index 8927f830be0..ead70f2ec15 100644 --- a/lib/api/src/externals/mod.rs +++ b/lib/api/src/externals/mod.rs @@ -16,7 +16,7 @@ pub use self::table::Table; use crate::exports::{ExportError, Exportable}; use crate::store::{Store, StoreObject}; use crate::ExternType; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt; use wasmer_engine::Export; diff --git a/lib/api/src/externals/table.rs b/lib/api/src/externals/table.rs index 3c625ae27f4..6423c6cd933 100644 --- a/lib/api/src/externals/table.rs +++ b/lib/api/src/externals/table.rs @@ -4,7 +4,7 @@ use crate::store::Store; use crate::types::{Val, ValFuncRef}; use crate::RuntimeError; use crate::TableType; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::sync::Arc; use wasmer_engine::{Export, ExportTable}; use wasmer_vm::{Table as RuntimeTable, VMCallerCheckedAnyfunc, VMExportTable}; diff --git a/lib/api/src/instance.rs b/lib/api/src/instance.rs index 327bfb60d75..592fd2eeca9 100644 --- a/lib/api/src/instance.rs +++ b/lib/api/src/instance.rs @@ -3,7 +3,7 @@ use crate::externals::Extern; use crate::module::Module; use crate::store::Store; use crate::{HostEnvInitError, LinkError, RuntimeError}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::fmt; use std::sync::{Arc, Mutex}; use thiserror::Error; diff --git a/lib/compiler/src/target.rs b/lib/compiler/src/target.rs index 1f569b3d5b9..12b2b06f1c6 100644 --- a/lib/compiler/src/target.rs +++ b/lib/compiler/src/target.rs @@ -3,7 +3,7 @@ use crate::error::ParseCpuFeatureError; use crate::lib::std::str::FromStr; use crate::lib::std::string::{String, ToString}; use enumset::{EnumSet, EnumSetType}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; pub use target_lexicon::{ Architecture, BinaryFormat, CallingConvention, Endianness, OperatingSystem, PointerWidth, Triple, diff --git a/lib/engine-native/src/engine.rs b/lib/engine-native/src/engine.rs index a7797b98a57..84f857fd6d6 100644 --- a/lib/engine-native/src/engine.rs +++ b/lib/engine-native/src/engine.rs @@ -2,7 +2,7 @@ use crate::NativeArtifact; use libloading::Library; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::path::Path; use std::sync::Arc; use std::sync::Mutex; diff --git a/lib/engine/src/export.rs b/lib/engine/src/export.rs index 754cc689dc0..d0014eb8c2c 100644 --- a/lib/engine/src/export.rs +++ b/lib/engine/src/export.rs @@ -1,4 +1,4 @@ -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::sync::Arc; use wasmer_vm::{ ImportInitializerFuncPtr, VMExport, VMExportFunction, VMExportGlobal, VMExportMemory, @@ -76,11 +76,11 @@ pub struct ExportFunctionMetadata { /// we create the `api::Instance`. // This one is optional for now because dynamic host envs need the rest // of this without the init fn - #[memoryusage(ignore)] + #[loupe(skip)] pub(crate) import_init_function_ptr: Option, /// A function analogous to `Clone::clone` that returns a leaked `Box`. - #[memoryusage(ignore)] + #[loupe(skip)] pub(crate) host_env_clone_fn: fn(*mut std::ffi::c_void) -> *mut std::ffi::c_void, /// The destructor to free the host environment. @@ -88,7 +88,7 @@ pub struct ExportFunctionMetadata { /// # Safety /// - This function should only be called in when properly synchronized. /// For example, in the `Drop` implementation of this type. - #[memoryusage(ignore)] + #[loupe(skip)] pub(crate) host_env_drop_fn: unsafe fn(*mut std::ffi::c_void), } diff --git a/lib/vm/src/export.rs b/lib/vm/src/export.rs index 500ae967563..806178ab47f 100644 --- a/lib/vm/src/export.rs +++ b/lib/vm/src/export.rs @@ -6,7 +6,7 @@ use crate::instance::InstanceRef; use crate::memory::{Memory, MemoryStyle}; use crate::table::{Table, TableStyle}; use crate::vmcontext::{VMFunctionBody, VMFunctionEnvironment, VMFunctionKind, VMTrampoline}; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use std::sync::Arc; use wasmer_types::{FunctionType, MemoryType, TableType}; @@ -47,7 +47,7 @@ pub struct VMExportFunction { /// /// May be `None` when the function is a host function (`FunctionType` /// == `Dynamic` or `vmctx` == `nullptr`). - #[memoryusage(ignore)] + #[loupe(skip)] pub call_trampoline: Option, /// A “reference” to the instance through the diff --git a/lib/vm/src/instance/mod.rs b/lib/vm/src/instance/mod.rs index dd31d3617cf..c0b4ae7a0a2 100644 --- a/lib/vm/src/instance/mod.rs +++ b/lib/vm/src/instance/mod.rs @@ -28,7 +28,6 @@ use crate::vmcontext::{ use crate::{FunctionBodyPtr, ModuleInfo, VMOffsets}; use crate::{VMExportFunction, VMExportGlobal, VMExportMemory, VMExportTable}; use loupe::{MemoryUsage, MemoryUsageTracker}; -use loupe_derive::MemoryUsage; use memoffset::offset_of; use more_asserts::assert_lt; use std::any::Any; @@ -80,7 +79,7 @@ pub(crate) struct Instance { functions: BoxedSlice, /// Pointers to function call trampolines in executable memory. - #[memoryusage(ignore)] + #[loupe(skip)] function_call_trampolines: BoxedSlice, /// Passive elements in this instantiation. As `elem.drop`s happen, these @@ -95,7 +94,7 @@ pub(crate) struct Instance { host_state: Box, /// Handler run when `SIGBUS`, `SIGFPE`, `SIGILL`, or `SIGSEGV` are caught by the instance thread. - #[memoryusage(ignore)] + #[loupe(skip)] pub(crate) signal_handler: Cell>>, /// Functions to operate on host environments in the imports @@ -109,7 +108,7 @@ pub(crate) struct Instance { /// field is last, and represents a dynamically-sized array that /// extends beyond the nominal end of the struct (similar to a /// flexible array member). - #[memoryusage(ignore)] + #[loupe(skip)] vmctx: VMContext, } diff --git a/lib/vm/src/vmoffsets.rs b/lib/vm/src/vmoffsets.rs index 4b86212c57a..6a6fa5b26fb 100644 --- a/lib/vm/src/vmoffsets.rs +++ b/lib/vm/src/vmoffsets.rs @@ -8,7 +8,7 @@ use crate::module::ModuleInfo; use crate::VMBuiltinFunctionIndex; -use loupe_derive::MemoryUsage; +use loupe::MemoryUsage; use more_asserts::assert_lt; use std::convert::TryFrom; use wasmer_types::{