RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:57:45 +00:00
Code Issues Activity Actions

Kernel: VERIFY that Scheduler::context_switch() always has a from-thread

Browse source 
We always context_switch() from somewhere, so there's no need to handle
the case where from_thread is null.
This commit is contained in:
Andreas Kling 2022-01-30 14:04:46 +01:00
parent 09f0843716
commit 684d5eed19
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Scheduler.cpp
View file

@ -276,23 +276,23 @@ bool Scheduler::context_switch(Thread* thread)
thread->did_schedule();
auto* from_thread = Thread::current();
VERIFY(from_thread);
if (from_thread == thread)
return false;
if (from_thread) {
// If the last process hasn't blocked (still marked as running),
// mark it as runnable for the next round.
if (from_thread->state() == Thread::State::Running)
from_thread->set_state(Thread::State::Runnable);
// If the last process hasn't blocked (still marked as running),
// mark it as runnable for the next round.
if (from_thread->state() == Thread::State::Running)
from_thread->set_state(Thread::State::Runnable);
#ifdef LOG_EVERY_CONTEXT_SWITCH
const auto msg = "Scheduler[{}]: {} -> {} [prio={}] {:#04x}:{:p}";
const auto msg = "Scheduler[{}]: {} -> {} [prio={}] {:#04x}:{:p}";
dbgln(msg,
Processor::current_id(), from_thread->tid().value(),
thread->tid().value(), thread->priority(), thread->regs().cs, thread->regs().ip());
dbgln(msg,
Processor::current_id(), from_thread->tid().value(),
thread->tid().value(), thread->priority(), thread->regs().cs, thread->regs().ip());
#endif
}
auto& proc = Processor::current();
if (!thread->is_initialized()) {