ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 18:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lx_emul: make memory allocation more clear

Browse Source
This commit is contained in:
Christian Helmuth 2023-11-08 17:22:47 +01:00
parent 963b8b0607
commit 7cefeac8ed
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
repos/dde_linux/src/lib/lx_kit/memory.cc
View File

@ -57,16 +57,19 @@ Genode::Dataspace_capability Lx_kit::Mem_allocator::attached_dataspace_cap(void
} }
void * Lx_kit::Mem_allocator::alloc(size_t size, size_t align) void * Lx_kit::Mem_allocator::alloc(size_t const size, size_t const align)
{ {
if (!size) if (!size)
return nullptr; return nullptr;
auto cleared_allocation = [] (void * const ptr, size_t const size) {
memset(ptr, 0, size);
return ptr;
};
return _mem.alloc_aligned(size, (unsigned)log2(align)).convert<void *>( return _mem.alloc_aligned(size, (unsigned)log2(align)).convert<void *>(
[&] (void *ptr) { [&] (void *ptr) { return cleared_allocation(ptr, size); },
memset(ptr, 0, size);
return ptr; },
[&] (Range_allocator::Alloc_error) { [&] (Range_allocator::Alloc_error) {
@ -92,9 +95,7 @@ void * Lx_kit::Mem_allocator::alloc(size_t size, size_t align)
/* re-try allocation */ /* re-try allocation */
return _mem.alloc_aligned(size, (unsigned)log2(align)).convert<void *>( return _mem.alloc_aligned(size, (unsigned)log2(align)).convert<void *>(
[&] (void *ptr) { [&] (void *ptr) { return cleared_allocation(ptr, size); },
memset(ptr, 0, size);
return ptr; },
[&] (Range_allocator::Alloc_error) -> void * { [&] (Range_allocator::Alloc_error) -> void * {
error("memory allocation failed for ", size, " align ", align); error("memory allocation failed for ", size, " align ", align);