Skip to content

SC: Add destructor to wasm_allocator to release memory #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linh2931 merged 3 commits into from
Apr 22, 2025
Merged

SC: Add destructor to wasm_allocator to release memory #39

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c34834
Add destructor to wasm_allocator to release memory
linh2931 Apr 19, 2025
62ca574
Set raw to nullptr after memory is freed
linh2931 Apr 21, 2025
0781f08
Rename free() to ~wasm_allocator()
linh2931 Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/eosio/vm/allocator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,6 @@ namespace eosio { namespace vm {
int err = mprotect(raw + (page_size * page), (page_size * size), PROT_NONE);
EOS_VM_ASSERT(err == 0, wasm_bad_alloc, "mprotect failed");
}
void free() {
std::size_t syspagesize = static_cast<std::size_t>(::sysconf(_SC_PAGESIZE));
munmap(raw - syspagesize, max_memory + 2*syspagesize);
}
wasm_allocator() {
std::size_t syspagesize = static_cast<std::size_t>(::sysconf(_SC_PAGESIZE));
raw = (char*)mmap(NULL, max_memory + 2*syspagesize, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
Expand All @@ -488,6 +484,10 @@ namespace eosio { namespace vm {
raw += syspagesize;
page = 0;
}
~wasm_allocator() {
std::size_t syspagesize = static_cast<std::size_t>(::sysconf(_SC_PAGESIZE));
munmap(raw - syspagesize, max_memory + 2*syspagesize); // raw is never null after wasm_allocator is constructed
}
// Initializes the memory controlled by the allocator.
//
// \post get_current_page() == new_pages
Expand Down