Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: kmalloc will always print debug on failed alloc

This commit is contained in:
Bananymous 2023-04-19 18:05:01 +03:00
parent a993d997ad
commit a159c980ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/kernel/Memory/kmalloc.cpp
View File

@ -291,15 +291,15 @@ void* kmalloc(size_t size, size_t align)
{ {
const kmalloc_info& info = s_kmalloc_info; const kmalloc_info& info = s_kmalloc_info;
if (size == 0 || size >= info.size)
return nullptr;
ASSERT(is_power_of_two(align)); ASSERT(is_power_of_two(align));
if (align < s_kmalloc_min_align) if (align < s_kmalloc_min_align)
align = s_kmalloc_min_align; align = s_kmalloc_min_align;
Kernel::CriticalScope critical; Kernel::CriticalScope critical;
if (size == 0 || size >= info.size)
goto no_memory;
// if the size fits into fixed node, we will try to use that since it is faster // if the size fits into fixed node, we will try to use that since it is faster
if (align == s_kmalloc_min_align && size <= sizeof(kmalloc_fixed_info::node::data)) if (align == s_kmalloc_min_align && size <= sizeof(kmalloc_fixed_info::node::data))
if (void* result = kmalloc_fixed()) if (void* result = kmalloc_fixed())
@ -311,10 +311,10 @@ void* kmalloc(size_t size, size_t align)
if (void* res = kmalloc_impl(size, align)) if (void* res = kmalloc_impl(size, align))
return res; return res;
no_memory:
dwarnln("could not allocate {H} bytes ({} aligned)", size, align); dwarnln("could not allocate {H} bytes ({} aligned)", size, align);
dwarnln(" {6H} free (fixed)", s_kmalloc_fixed_info.free); dwarnln(" {6H} free (fixed)", s_kmalloc_fixed_info.free);
dwarnln(" {6H} free", s_kmalloc_info.free); dwarnln(" {6H} free", s_kmalloc_info.free);
debug_dump();
Debug::dump_stack_trace(); Debug::dump_stack_trace();
ASSERT(!is_corrupted()); ASSERT(!is_corrupted());