RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +00:00
Code Issues Activity Actions

Kernel: Handle string format errors in SlabAllocator stats :^)

Browse source 
Switch to KString::formatted and fix API so we can propagate errors.
This commit is contained in:
Brian Gianforcaro 2021-11-29 03:01:24 -08:00 • committed by Andreas Kling
parent a0e59099fc
commit 74ee491b84
3 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Kernel/GlobalProcessExposed.cpp
View file

@ -412,11 +412,14 @@ private:
json.add("super_physical_available", system_memory.super_physical_pages - system_memory.super_physical_pages_used);
json.add("kmalloc_call_count", stats.kmalloc_call_count);
json.add("kfree_call_count", stats.kfree_call_count);
slab_alloc_stats([&json](size_t slab_size, size_t num_allocated, size_t num_free) {
auto prefix = String::formatted("slab_{}", slab_size);
json.add(String::formatted("{}_num_allocated", prefix), num_allocated);
json.add(String::formatted("{}_num_free", prefix), num_free);
});
TRY(slab_alloc_stats([&json](size_t slab_size, size_t num_allocated, size_t num_free) -> ErrorOr<void> {
auto prefix = TRY(KString::formatted("slab_{}", slab_size));
auto formatted_num_allocated = TRY(KString::formatted("{}_num_allocated", prefix));
auto formatted_num_free = TRY(KString::formatted("{}_num_free", prefix));
json.add(formatted_num_allocated->view(), num_allocated);
json.add(formatted_num_free->view(), num_free);
return {};
}));
json.finish();
return {};
}
@ -952,7 +955,8 @@ ErrorOr<void> ProcFSRootDirectory::traverse_as_directory(FileSystemID fsid, Func
VERIFY(!(process.pid() < 0));
u64 process_id = (u64)process.pid().value();
InodeIdentifier identifier = { fsid, static_cast<InodeIndex>(process_id << 36) };
TRY(callback({ String::formatted("{:d}", process.pid().value()), identifier, 0 }));
auto process_id_string = TRY(KString::formatted("{:d}", process_id));
TRY(callback({ process_id_string->view(), identifier, 0 }));
}
return {};
});