From b13f1699fc646d85e4b78313afd4856923775eb2 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 19 Jul 2019 09:37:34 +0200 Subject: Kernel: Rename Condition state to Blocked now we only have one blocking mechanism :) --- Kernel/Thread.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'Kernel/Thread.cpp') diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index f0d21c12b3..13f21485ff 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -111,7 +111,7 @@ void Thread::unblock() void Thread::block_until(Function&& condition) { m_blocker = make(condition); - block(Thread::BlockedCondition); + block(Thread::Blocked); Scheduler::yield(); } @@ -132,7 +132,7 @@ void Thread::block(Thread::State new_state) void Thread::block(Blocker& blocker) { m_blocker = &blocker; - block(Thread::BlockedCondition); + block(Thread::Blocked); } u64 Thread::sleep(u32 ticks) @@ -162,11 +162,8 @@ const char* to_string(Thread::State state) return "Skip1"; case Thread::Skip0SchedulerPasses: return "Skip0"; - case Thread::BlockedCondition: - return "Condition"; - case Thread::__Begin_Blocked_States__: - case Thread::__End_Blocked_States__: - break; + case Thread::Blocked: + return "Blocked"; } kprintf("to_string(Thread::State): Invalid state: %u\n", state); ASSERT_NOT_REACHED(); -- cgit v1.2.3