summaryrefslogtreecommitdiff
path: root/Kernel/Thread.cpp
diff options
context:
space:
mode:
authorRobin Burchell <robin+git@viroteck.net>2019-07-19 09:37:34 +0200
committerAndreas Kling <awesomekling@gmail.com>2019-07-19 11:03:22 +0200
commitb13f1699fc646d85e4b78313afd4856923775eb2 (patch)
tree21b962dca7480a5094d0cd57f3889385ed4fa32a /Kernel/Thread.cpp
parentd2ca91c024e0dca3742715392ad5b2cd6125563f (diff)
downloadserenity-b13f1699fc646d85e4b78313afd4856923775eb2.zip
Kernel: Rename Condition state to Blocked now we only have one blocking mechanism :)
Diffstat (limited to 'Kernel/Thread.cpp')
-rw-r--r--Kernel/Thread.cpp11
1 files changed, 4 insertions, 7 deletions
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<bool()>&& condition)
{
m_blocker = make<ConditionBlocker>(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();