From 53ce923e103156f33d3cde405d9f34c7d2e788e8 Mon Sep 17 00:00:00 2001 From: AnotherTest Date: Sun, 17 Jan 2021 12:32:26 +0330 Subject: [PATCH] Everywhere: Fix obvious dbgln() bugs This will allow compiletime dbgln() checks to pass --- Kernel/FutexQueue.cpp | 2 +- Kernel/Scheduler.cpp | 2 +- Kernel/Thread.h | 2 +- Userland/Libraries/LibELF/DynamicLoader.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/FutexQueue.cpp b/Kernel/FutexQueue.cpp index 9222fe7dc8..ab3bfd959e 100644 --- a/Kernel/FutexQueue.cpp +++ b/Kernel/FutexQueue.cpp @@ -133,7 +133,7 @@ u32 FutexQueue::wake_all(bool& is_empty) ASSERT(data); ASSERT(b.blocker_type() == Thread::Blocker::Type::Futex); auto& blocker = static_cast(b); - dbgln("FutexQueue @ {}: wake_all unblocking", this, *static_cast(data)); + dbgln("FutexQueue @ {}: wake_all unblocking {}", this, *static_cast(data)); if (blocker.unblock(true)) { did_wake++; return true; diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp index 457bc1d4b4..3a65b2f416 100644 --- a/Kernel/Scheduler.cpp +++ b/Kernel/Scheduler.cpp @@ -231,7 +231,7 @@ bool Scheduler::pick_next() } if constexpr (SCHEDULER_RUNNABLE_DEBUG) { - dbgln("Scheduler thread list:", Processor::id()); + dbgln("Scheduler thread list for processor {}:", Processor::id()); Thread::for_each([&](Thread& thread) -> IterationDecision { switch (thread.state()) { case Thread::Dying: diff --git a/Kernel/Thread.h b/Kernel/Thread.h index 6ea94a044e..064c7577f1 100644 --- a/Kernel/Thread.h +++ b/Kernel/Thread.h @@ -903,7 +903,7 @@ public: } if (m_blocker && !m_blocker->can_be_interrupted() && !m_should_die) { block_lock2.unlock(); - dbgln("Thread should not be unblocking, current state: ", state_string()); + dbgln("Thread should not be unblocking, current state: {}", state_string()); set_state(Thread::Blocked); continue; } diff --git a/Userland/Libraries/LibELF/DynamicLoader.cpp b/Userland/Libraries/LibELF/DynamicLoader.cpp index 8694d9923a..e7b7453422 100644 --- a/Userland/Libraries/LibELF/DynamicLoader.cpp +++ b/Userland/Libraries/LibELF/DynamicLoader.cpp @@ -433,7 +433,7 @@ DynamicLoader::RelocationResult DynamicLoader::do_relocation(size_t total_tls_si // We could explicitly do them first using m_number_of_relocatoins from DT_RELCOUNT // However, our compiler is nice enough to put them at the front of the relocations for us :) dbgln("Load address relocation at offset {:#08x}", relocation.offset()); - dbgln(" patch ptr == %p, adding load base address ({:p}) to it and storing {:p}", *patch_ptr, m_dynamic_object->base_address().as_ptr(), *patch_ptr + m_dynamic_object->base_address().as_ptr()); + dbgln(" patch ptr == {:p}, adding load base address ({:p}) to it and storing {:p}", *patch_ptr, m_dynamic_object->base_address().as_ptr(), *patch_ptr + m_dynamic_object->base_address().as_ptr()); *patch_ptr += (FlatPtr)m_dynamic_object->base_address().as_ptr(); // + addend for RelA (addend for Rel is stored at addr) break; }