Scheduler fix, User RR
This commit is contained in:
+34
-18
@@ -50,31 +50,47 @@ struct cpu_status* scheduler_schedule(struct cpu_status* context)
|
||||
panic(NULL, "current_process->context is NULL");
|
||||
}
|
||||
|
||||
if (current_process->next == NULL) {
|
||||
return current_process->context;
|
||||
}
|
||||
|
||||
current_process->context = context;
|
||||
|
||||
for (;;) {
|
||||
struct process* prev_process = current_process;
|
||||
if (current_process->next != NULL) {
|
||||
current_process = current_process->next;
|
||||
} else {
|
||||
current_process = processes_list;
|
||||
}
|
||||
|
||||
if (current_process != NULL && current_process->status == DEAD) {
|
||||
process_delete(&prev_process, current_process);
|
||||
current_process = NULL;
|
||||
if (current_process->status == DEAD) {
|
||||
struct process* dead_process = current_process;
|
||||
struct process* next_process = (dead_process->next != NULL) ? dead_process->next : processes_list;
|
||||
|
||||
process_delete(&processes_list, dead_process);
|
||||
|
||||
if (processes_list == NULL || next_process == dead_process) {
|
||||
current_process = idle_proc;
|
||||
return idle_proc->context;
|
||||
} else {
|
||||
current_process->status = RUNNING;
|
||||
break;
|
||||
}
|
||||
|
||||
current_process = next_process;
|
||||
} else if (current_process->next != NULL) {
|
||||
current_process = current_process->next;
|
||||
} else {
|
||||
current_process = processes_list;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
if (current_process->status == DEAD) {
|
||||
struct process* dead_process = current_process;
|
||||
struct process* next_process = (current_process->next != NULL) ? current_process->next : processes_list;
|
||||
|
||||
process_delete(&processes_list, dead_process);
|
||||
|
||||
if (processes_list == NULL || next_process == dead_process) {
|
||||
current_process = idle_proc;
|
||||
return idle_proc->context;
|
||||
}
|
||||
|
||||
current_process = next_process;
|
||||
continue;
|
||||
}
|
||||
|
||||
current_process->status = RUNNING;
|
||||
break;
|
||||
}
|
||||
|
||||
// Here, we chose next running process so we load its kernel stack & page tables
|
||||
tss.rsp0 = (uint64_t)current_process->kernel_stack;
|
||||
load_cr3(VIRT_TO_PHYS((uint64_t)current_process->root_page_table));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user