RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 14:35:07 +00:00
Code Issues Activity Actions

The colonel task already had a halt loop.

Browse source 
Also don't reap() current in the scheduler, just wait until it's not current.
This commit is contained in:
Andreas Kling 2018-11-08 00:30:35 +01:00
parent ac1d12465f
commit e287f8ef3a
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/Scheduler.cpp
View file

@ -66,7 +66,7 @@ bool Scheduler::pick_next()
} }
if (process.state() == Process::Dead) { if (process.state() == Process::Dead) {
if (!Process::from_pid(process.ppid())) if (current != &process && !Process::from_pid(process.ppid()))
Process::reap(process.pid()); Process::reap(process.pid());
return true; return true;
} }
@ -242,19 +242,12 @@ void Scheduler::prepare_to_modify_tss(Process& process)
load_task_register(s_redirection.selector); load_task_register(s_redirection.selector);
} }
static void hlt_loop()
{
for (;;) {
asm volatile("hlt");
}
}
void Scheduler::initialize() void Scheduler::initialize()
{ {
memset(&s_redirection, 0, sizeof(s_redirection)); memset(&s_redirection, 0, sizeof(s_redirection));
s_redirection.selector = gdt_alloc_entry(); s_redirection.selector = gdt_alloc_entry();
initialize_redirection(); initialize_redirection();
s_colonel_process = Process::create_kernel_process(hlt_loop, "colonel"); s_colonel_process = Process::create_kernel_process(nullptr, "colonel");
current = nullptr; current = nullptr;
load_task_register(s_redirection.selector); load_task_register(s_redirection.selector);
} }