Skip to content

Various fixes #368

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

Open
devnexen wants to merge 3 commits into
base: develop
Choose a base branch
from
+10 −4
Open

Various fixes #368

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a917a69
enable decommit / free the newly allocated block on commit failure.
devnexen Jan 16, 2026
a6bedc1
heap statistics build failure fix
devnexen Jan 16, 2026
9fa9e67
forgotten code path for non huge block
devnexen Jan 16, 2026
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
14 changes: 10 additions & 4 deletions rpmalloc/rpmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,7 +1298,7 @@ span_deallocate_block(span_t* span, page_t* page, void* block) {
#if ENABLE_DECOMMIT
span->heap->stats.committed_size -= span->page_count * span->page_size;
#else
span->heap->stats.committed_size -= mapped_size;
span->heap->stats.committed_size -= span->mapped_size;
#endif
}
#endif
Expand Down Expand Up @@ -1417,8 +1417,10 @@ heap_allocate_new(void) {
size_t mapped_size = 0;
block_t* block = global_memory_interface->memory_map(heap_size, 0, &offset, &mapped_size);
#if ENABLE_DECOMMIT
if (global_memory_interface->memory_commit(block, heap_size) != 0)
if (global_memory_interface->memory_commit(block, heap_size) != 0) {
global_memory_interface->memory_unmap(block, offset, mapped_size);
return 0;
}
#endif
heap_t* heap = heap_initialize((void*)block);
heap->offset = (uint32_t)offset;
Expand Down Expand Up @@ -1545,8 +1547,10 @@ heap_get_span(heap_t* heap, page_type_t page_type) {
page_address_mask = LARGE_PAGE_MASK;
}
#if ENABLE_DECOMMIT
if (global_memory_interface->memory_commit(span, page_size) != 0)
if (global_memory_interface->memory_commit(span, page_size) != 0) {
global_memory_interface->memory_unmap(span, offset, mapped_size);
return 0;
}
#endif
#if RPMALLOC_HEAP_STATISTICS
#if ENABLE_DECOMMIT
Expand Down Expand Up @@ -1674,8 +1678,10 @@ heap_allocate_block_huge(heap_t* heap, size_t size, unsigned int zero) {
if (block) {
span_t* span = block;
#if ENABLE_DECOMMIT
if (global_memory_interface->memory_commit(span, alloc_size) != 0)
if (global_memory_interface->memory_commit(span, alloc_size) != 0) {
global_memory_interface->memory_unmap(block, offset, mapped_size);
return 0;
}
#endif
#if RPMALLOC_HEAP_STATISTICS
heap->stats.mapped_size += mapped_size;
Expand Down