feat: Implement MemoryUsage for Instance
#2201
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hywan
requested review from
jubianchi,
losfair,
MarkMcCaskey,
nlewycky and
syrusakbary
as code owners
lib/api/src/externals/function.rs
Outdated
| pub struct WasmFunctionDefinition { | ||
| // Address of the trampoline to do the call. | ||
| #[memoryusage(ignore)] |
There was a problem hiding this comment.
Consider #[loupe(ignore)] or #[loupe(skip)]. I think it's more common to use the crate name as a the unique first element in the attribute than the name of the trait. For example serde, structopt, WasmerEnv.
Serde even does #[serde(skip_serializing)] and #[serde(skip_deserializing)] to disambiguate the two
There was a problem hiding this comment.
I agree. Let's move to #[loupe(skip)].
Comment on lines
284
to
298
| impl<K, V> MemoryUsage for SecondaryMap<K, V> | ||
| where | ||
| K: EntityRef, | ||
| V: Clone + MemoryUsage, | ||
| { | ||
| fn size_of_val(&self, tracker: &mut dyn MemoryUsageTracker) -> usize { | ||
| mem::size_of_val(self) | ||
| + self | ||
| .elems | ||
| .iter() | ||
| .map(|value| value.size_of_val(tracker) - mem::size_of_val(value)) | ||
| .sum::<usize>() | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
I think you probably also need to do self.default.size_of_val(tracker), but that's a small nit pick
This was referenced Mar 22, 2021
Hywan
force-pushed
the
feat-memory-usage-instance
branch
from
6a8fa5d
to
64c1f08
Compare
Hywan
changed the title
MemoryUsage for InstanceMemoryUsage for Instance
Hywan
force-pushed
the
feat-memory-usage-instance
branch
from
64c1f08
to
d801eb4
Compare
`MemoryUsage` is implemented for `[T; N]` only on rustc nightly. Wasmer uses the stable channel of rustc. Thus, we re-implement `MemoryUsage` for `V128` by using `V128.as_slice()`.
MarkMcCaskey
approved these changes
Mar 23, 2021
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Mar 23, 2021
2201: feat: Implement `MemoryUsage` for `Instance` r=Hywan a=Hywan # Description This patch implements `loupe::MemoryUsage` for `wasmer::Instance`. ~~This PR includes #2200. To review unique patches: https://github.com/Hywan/wasmer/compare/feat-memory-usage-module...feat-memory-usage-instance?expand=1~~ # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Ivan Enderlin <ivan@mnt.io>
|
Build failed: |
|
bors r+ |
syrusakbary
approved these changes
Mar 23, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This patch implements
loupe::MemoryUsageforwasmer::Instance.This PR includes #2200. To review unique patches: https://github.com/Hywan/wasmer/compare/feat-memory-usage-module...feat-memory-usage-instance?expand=1Review