memory fixes for windows #138
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
xmclark
commented
Feb 5, 2019
| @@ -103,7 +95,7 @@ impl Memory { | |||
| impl Drop for Memory { | |||
| fn drop(&mut self) { | |||
| if !self.ptr.is_null() { | |||
| let success = unsafe { libc::munmap(self.ptr as _, self.size) }; | |||
| let success = unsafe { VirtualFree(self.ptr as _, self.size, MEM_DECOMMIT) }; | |||
There was a problem hiding this comment.
the winapi equivalent of munmap
syrusakbary
approved these changes
Feb 5, 2019
lachlansneff
approved these changes
Feb 6, 2019
|
|
||
| if ptr.is_null() { | ||
| Err("unable to allocate memory") | ||
| Err(String::from("unable to allocate memory")) |
There was a problem hiding this comment.
I'd prefer .to_string here, but it doesn't matter much.
nlewycky
pushed a commit
that referenced
this pull request
Aug 13, 2020
…-from-env doc(wasi) Fix documentation of `generate_import_object_from_env`
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.
This PR fixes a few small issues with building memory code for windows. We use the winapi
VirtualFreeinstead ofmunmap. A few crates were added that had been missing from the wasmer runtime crate.