[sched] fix scheduler crash, refactored to dynamic types

Author: CodeAnarchist

kernel/bin/monitor_processes.c

@@ -41,16 +41,16 @@ uint64_t calc_heap(uintptr_t ptr){
 char *procname;
 
 void print_process_info(){
-    process_t *processes = get_all_processes();
-    for (int i = 0; i < MAX_PROCS; i++){
-        process_t *proc = &processes[i];
+    process_t *proc = get_all_processes();
+    while (proc){
         if (proc->id != 0 && proc->state != STOPPED && (!procname || strcmp_case(procname,proc->name,true) == 0)){
-            print("Process [%i]: %s [pid = %i | status = %s]",i,(uintptr_t)proc->name,proc->id,(uintptr_t)parse_proc_state(proc->state));
+            print("Process %s [pid = %i | status = %s]",(uintptr_t)proc->name,proc->id,(uintptr_t)parse_proc_state(proc->state));
             print("Stack: %x (%x). SP: %x",proc->stack, proc->stack_size, proc->sp);
             print("Heap: %x (%x)",proc->mm.mmap_bottom, calc_heap(proc->heap_phys));
             print("Flags: %x", proc->spsr);
             print("PC: %x",proc->pc);
         }
+        proc = proc->process_next;
     }
 }
 
@@ -79,7 +79,6 @@ void draw_memory(char *name,int x, int y, int width, int full_height, int used,
 
 void draw_process_view(){
     fb_clear(&ctx,system_theme.bg_color+0x112211);
-    process_t *processes = get_all_processes();
     gpu_size screen_size = (gpu_size){ctx.width,ctx.height};
     gpu_point screen_middle = {screen_size.width / 2, screen_size.height / 2};
 
@@ -90,26 +89,25 @@ void draw_process_view(){
         if (ev.key == KEY_LEFT)
             scroll_index = max(scroll_index - 1, 0);
         if (ev.key == KEY_RIGHT)
-            scroll_index = min(scroll_index + 1,MAX_PROCS);
+            scroll_index++;
     }
 
     for (int i = 0; i < PROCS_PER_SCREEN; i++) {
-        int index = scroll_index;
-        int valid_count = 0;
+        uint16_t index = scroll_index+i;
+        uint16_t valid_count = 0;
+        process_t *proc = get_all_processes();
 
-        process_t *proc = NULL;
-        while (index < MAX_PROCS) {
-            proc = &processes[index];
+        while (proc) {
             if (proc->id != 0 && proc->state != STOPPED) {
-                if (valid_count == i + scroll_index) {
+                if (valid_count == index) {
                     break;
                 }
                 valid_count++;
             }
-            index++;
+            proc = proc->process_next;
         }
 
-        if (proc == NULL || proc->id == 0 || valid_count < i || proc->state == STOPPED) break;
+        if (proc == NULL || proc->id == 0 || proc->state == STOPPED) break;
 
         string name = string_from_literal((const char*)(uintptr_t)proc->name);
         string state = string_from_literal(parse_proc_state(proc->state));

kernel/exceptions/timer.c

@@ -34,6 +34,8 @@ static inline void timer_enable() {
 void permanent_disable_timer(){
     uint64_t ctl = 0;
     asm volatile ("msr cntp_ctl_el0, %0" :: "r"(ctl));
+    asm volatile ("msr cntv_ctl_el0, %0" :: "r"(ctl));
+    asm volatile ("isb");
 }
 
 void timer_init(uint64_t msecs) {
@@ -58,6 +60,11 @@ void virtual_timer_enable() {
     asm volatile ("msr cntv_ctl_el0, %0" :: "r"(val));
 }
 
+void virtual_timer_disable() {
+    uint64_t val = 0;
+    asm volatile ("msr cntv_ctl_el0, %0" :: "r"(val));
+}
+
 uint64_t virtual_timer_remaining_msec() {
     uint64_t ticks;
     uint64_t freq = rd_cntfrq_el0();

kernel/exceptions/timer.h

@@ -11,6 +11,7 @@ void timer_reset(uint64_t time);
 
 void virtual_timer_reset(uint64_t smsecs);
 void virtual_timer_enable();
+void virtual_timer_disable();
 uint64_t virtual_timer_remaining_msec();
 
 uint64_t timer_now();

kernel/input/input_dispatch.cpp

@@ -45,6 +45,7 @@ bool register_keypress(keypress kp) {
     if (buf->write_index == buf->read_index)
         buf->read_index = (buf->read_index + 1) % INPUT_BUFFER_CAPACITY;
 
+    if (focused_proc->sleeping) wake_process(focused_proc);
     return false;
 }
 
@@ -59,6 +60,7 @@ void register_event(kbd_event event){
 
     if (buf->write_index == buf->read_index)
         buf->read_index = (buf->read_index + 1) % INPUT_BUFFER_CAPACITY;
+    if (focused_proc->sleeping) wake_process(focused_proc);
 }
 
 void mouse_config(gpu_point point, gpu_size size){
@@ -91,6 +93,7 @@ void register_mouse_input(mouse_input *rat){
         gpu_set_cursor_pressed(last_cursor_state);
         gpu_update_cursor(mouse_loc, true);
     }
+    if (focused_proc && focused_proc->sleeping) wake_process(focused_proc);
 }
 
 gpu_point get_mouse_pos(){

kernel/process/process.h

@@ -42,6 +42,9 @@ typedef struct process {
     uint64_t spsr; 
     //Not used in process saving
     uint16_t id;
+    bool in_ready_queue;
+    bool sleeping;
+    uint64_t wake_at_msec;
     uintptr_t stack;
     paddr_t stack_phys;
     uint64_t stack_size;
@@ -70,6 +73,7 @@ typedef struct process {
     sizedptr debug_line_str;
     system_module exposed_fs;
     mm_struct mm;
+    struct process *process_next;
 } process_t;
 
 //Helper functions for accessing registers mapped to scratch regs