RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 14:25:08 +00:00
Code Issues Activity Actions

Kernel: Use consistent names for kmalloc globals and remove volatile

Browse source
This commit is contained in:
Andreas Kling 2020-05-16 10:37:31 +02:00
parent 154a6e69a4
commit ca4f714d68
3 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/FileSystem/ProcFS.cpp
View file

@ -823,15 +823,15 @@ Optional<KBuffer> procfs$memstat(InodeIdentifier)
InterruptDisabler disabler;
KBufferBuilder builder;
JsonObjectSerializer<KBufferBuilder> json { builder };
json.add("kmalloc_allocated", (u32)sum_alloc);
json.add("kmalloc_available", (u32)sum_free);
json.add("kmalloc_eternal_allocated", (u32)kmalloc_sum_eternal);
json.add("kmalloc_allocated", (u32)g_kmalloc_bytes_allocated);
json.add("kmalloc_available", (u32)g_kmalloc_bytes_free);
json.add("kmalloc_eternal_allocated", (u32)g_kmalloc_bytes_eternal);
json.add("user_physical_allocated", MM.user_physical_pages_used());
json.add("user_physical_available", MM.user_physical_pages() - MM.user_physical_pages_used());
json.add("super_physical_allocated", MM.super_physical_pages_used());
json.add("super_physical_available", MM.super_physical_pages() - MM.super_physical_pages_used());
json.add("kmalloc_call_count", g_kmalloc_call_count);
json.add("kfree_call_count", g_kfree_call_count);
json.add("kmalloc_call_count", (u32)g_kmalloc_call_count);
json.add("kfree_call_count", (u32)g_kfree_call_count);
slab_alloc_stats([&json](size_t slab_size, size_t num_allocated, size_t num_free) {
auto prefix = String::format("slab_%zu", slab_size);
json.add(String::format("%s_num_allocated", prefix.characters()), (u32)num_allocated);