nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

kern: fix some typos/naming semantics

Browse source
This commit is contained in:
Michael Scire 2020-12-12 05:36:48 -08:00
parent 4b71e3a87e
commit 16cd1141d1
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/libmesosphere/source/kern_k_dump_object.cpp
View file

@ -657,11 +657,11 @@ namespace ams::kern::KDumpObject {
void DumpKernelCpuUtilization() { void DumpKernelCpuUtilization() {
MESOSPHERE_RELEASE_LOG("Dump Kernel Cpu Utilization\n"); MESOSPHERE_RELEASE_LOG("Dump Kernel Cpu Utilization\n");
constexpr size_t MaxLogDepth = 64; constexpr size_t MaxObjects = 64;
{ {
/* Create tracking arrays. */ /* Create tracking arrays. */
KAutoObject *objects[MaxLogDepth]; KAutoObject *objects[MaxObjects];
u32 cpu_time[MaxLogDepth]; u32 cpu_time[MaxObjects];
s64 start_tick; s64 start_tick;
size_t i, n; size_t i, n;
@ -679,7 +679,7 @@ namespace ams::kern::KDumpObject {
for (auto it = accessor.begin(); it != end; ++it) { for (auto it = accessor.begin(); it != end; ++it) {
KThread *thread = static_cast<KThread *>(std::addressof(*it)); KThread *thread = static_cast<KThread *>(std::addressof(*it));
if (KProcess *process = thread->GetOwnerProcess(); process == nullptr) { if (KProcess *process = thread->GetOwnerProcess(); process == nullptr) {
if (AMS_LIKELY(i < MaxLogDepth)) { if (AMS_LIKELY(i < MaxObjects)) {
if (AMS_LIKELY(thread->Open())) { if (AMS_LIKELY(thread->Open())) {
cpu_time[i] = thread->GetCpuTime(); cpu_time[i] = thread->GetCpuTime();
objects[i] = thread; objects[i] = thread;
@ -727,11 +727,13 @@ namespace ams::kern::KDumpObject {
void DumpCpuUtilization() { void DumpCpuUtilization() {
MESOSPHERE_RELEASE_LOG("Dump Cpu Utilization\n"); MESOSPHERE_RELEASE_LOG("Dump Cpu Utilization\n");
constexpr size_t MaxLogDepth = 64; /* NOTE: Nintendo uses 0x40 as maximum here, but the KProcess slabheap has 0x50 entries. */
/* We have the stack space, so there's no reason not to allow logging all processes. */
constexpr size_t MaxObjects = 0x50;
{ {
/* Create tracking arrays. */ /* Create tracking arrays. */
KAutoObject *objects[MaxLogDepth]; KAutoObject *objects[MaxObjects];
u32 cpu_time[MaxLogDepth]; u32 cpu_time[MaxObjects];
s64 start_tick; s64 start_tick;
size_t i, n; size_t i, n;
@ -748,7 +750,7 @@ namespace ams::kern::KDumpObject {
i = 0; i = 0;
for (auto it = accessor.begin(); it != end; ++it) { for (auto it = accessor.begin(); it != end; ++it) {
KProcess *process = static_cast<KProcess *>(std::addressof(*it)); KProcess *process = static_cast<KProcess *>(std::addressof(*it));
if (AMS_LIKELY(i < MaxLogDepth)) { if (AMS_LIKELY(i < MaxObjects)) {
if (AMS_LIKELY(process->Open())) { if (AMS_LIKELY(process->Open())) {
cpu_time[i] = process->GetCpuTime(); cpu_time[i] = process->GetCpuTime();
objects[i] = process; objects[i] = process;
@ -793,13 +795,13 @@ namespace ams::kern::KDumpObject {
} }
void DumpCpuUtilization(u64 process_id) { void DumpCpuUtilization(u64 process_id) {
MESOSPHERE_RELEASE_LOG("Dump Kernel Cpu Utilization\n"); MESOSPHERE_RELEASE_LOG("Dump Cpu Utilization\n");
constexpr size_t MaxLogDepth = 64; constexpr size_t MaxObjects = 64;
{ {
/* Create tracking arrays. */ /* Create tracking arrays. */
KAutoObject *objects[MaxLogDepth]; KAutoObject *objects[MaxObjects];
u32 cpu_time[MaxLogDepth]; u32 cpu_time[MaxObjects];
s64 start_tick; s64 start_tick;
size_t i, n; size_t i, n;
@ -817,7 +819,7 @@ namespace ams::kern::KDumpObject {
for (auto it = accessor.begin(); it != end; ++it) { for (auto it = accessor.begin(); it != end; ++it) {
KThread *thread = static_cast<KThread *>(std::addressof(*it)); KThread *thread = static_cast<KThread *>(std::addressof(*it));
if (KProcess *process = thread->GetOwnerProcess(); process != nullptr && process->GetId() == process_id) { if (KProcess *process = thread->GetOwnerProcess(); process != nullptr && process->GetId() == process_id) {
if (AMS_LIKELY(i < MaxLogDepth)) { if (AMS_LIKELY(i < MaxObjects)) {
if (AMS_LIKELY(thread->Open())) { if (AMS_LIKELY(thread->Open())) {
cpu_time[i] = thread->GetCpuTime(); cpu_time[i] = thread->GetCpuTime();
objects[i] = thread; objects[i] = thread;