diff options
| -rw-r--r-- | apps/init.c | 1 | ||||
| -rw-r--r-- | apps/mandelbrot.c | 1 | ||||
| -rw-r--r-- | kernel/features/proc.c | 13 | ||||
| -rw-r--r-- | libc/inc/sys.h | 1 |
4 files changed, 11 insertions, 5 deletions
diff --git a/apps/init.c b/apps/init.c index 01eb47d..ba6f93e 100644 --- a/apps/init.c +++ b/apps/init.c @@ -9,7 +9,6 @@ int main(int argc, char **argv) printf("ARGC: %d\n", argc); printf("[%s loaded]\n", argv[0]); - // TODO: Fix GPF if file doesn't exist int wm = exec("/wm", "wm", argv[1], NULL); /* int test = exec("/window", "test", NULL); */ int mandelbrot = exec("/mandelbrot", "mandelbrot", NULL); diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c index a2be040..d5b8ae0 100644 --- a/apps/mandelbrot.c +++ b/apps/mandelbrot.c @@ -48,6 +48,7 @@ void draw_mandelbrot(struct window *win, int resolution) } } gui_redraw(); + print("Rendered mandelbrot successfully\n"); yield(); } diff --git a/kernel/features/proc.c b/kernel/features/proc.c index 438ded7..a5df875 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -70,7 +70,7 @@ void proc_print() struct proc *proc_current() { - return current ? current->data : NULL; + return current && current->data ? current->data : NULL; } void proc_send(struct proc *src, struct proc *dest, enum message_type type, void *data) @@ -111,19 +111,24 @@ struct proc *proc_from_pid(u32 pid) void proc_exit(struct proc *proc, int status) { assert(proc); - printf("Process %s exited with status %d\n", proc->name, status); + int res = 0; struct node *iterator = proc_list->head; do { if (iterator->data == proc) { + res = 1; list_remove(proc_list, iterator); break; } } while ((iterator = iterator->next) != NULL); + if (memcmp(proc, current->data, sizeof(*proc)) == 0) + current = NULL; + + if (res) + printf("Process %s exited with status %d\n", proc->name, status); + quantum = 0; // TODO: Add quantum to each process struct? - sti(); - hlt(); } void proc_yield(struct regs *r) diff --git a/libc/inc/sys.h b/libc/inc/sys.h index 7c3e6fb..073ccd2 100644 --- a/libc/inc/sys.h +++ b/libc/inc/sys.h @@ -67,6 +67,7 @@ int sysv(enum sys num, ...); { \ sys1(SYS_EXIT, (int)status); \ while (1) { \ + yield(); \ } \ } #define yield() (int)sys0(SYS_YIELD) |