diff options
| -rw-r--r-- | apps/mandelbrot.c | 15 | ||||
| -rw-r--r-- | kernel/features/proc.c | 16 | ||||
| -rw-r--r-- | kernel/inc/proc.h | 2 |
3 files changed, 9 insertions, 24 deletions
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c index 6eef9ef..a2be040 100644 --- a/apps/mandelbrot.c +++ b/apps/mandelbrot.c @@ -42,6 +42,9 @@ void draw_mandelbrot(struct window *win, int resolution) rand() << 16 | rand() << 8 | rand() | 0xff000000); else draw_pixel(win, col, row, 0xff000000); + + if (row % 50 == 0 && col == 0) + gui_redraw(); } } gui_redraw(); @@ -54,17 +57,11 @@ int main() struct window *win = gui_new_window(WF_DEFAULT); gui_fill(win, BG_COLOR); - event_register(EVENT_KEYBOARD); - int resolution = 0; - struct message *msg; + draw_mandelbrot(win, 50); + while (1) { - if (!(msg = msg_receive())) { - yield(); - continue; - } - if (msg->type == EVENT_KEYBOARD && ((struct event_keyboard *)msg->data)->press) - draw_mandelbrot(win, ++resolution); + yield(); }; return 0; diff --git a/kernel/features/proc.c b/kernel/features/proc.c index 021a3d6..438ded7 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -30,10 +30,7 @@ void scheduler(struct regs *regs) return; } - if (current && ((struct proc *)current->data)->state == PROC_RESOLVED) { - memcpy(regs, &((struct proc *)current->data)->regs_backup, sizeof(struct regs)); - ((struct proc *)current->data)->state = PROC_DEFAULT; - } + assert(proc_list->head); if (current) memcpy(&((struct proc *)current->data)->regs, regs, sizeof(struct regs)); @@ -43,15 +40,6 @@ void scheduler(struct regs *regs) else current = proc_list->head; - while (!current) { - if (!current->next || !current->next->data) { - assert(proc_list->head); - current = proc_list->head; - } else { - current = current->next; - } - } - memcpy(regs, &((struct proc *)current->data)->regs, sizeof(struct regs)); if (regs->cs != GDT_USER_CODE_OFFSET) { @@ -123,7 +111,7 @@ struct proc *proc_from_pid(u32 pid) void proc_exit(struct proc *proc, int status) { assert(proc); - printf("Process %d exited with status %d\n", proc->pid, status); + printf("Process %s exited with status %d\n", proc->name, status); struct node *iterator = proc_list->head; do { diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h index 0c0ec9e..2335d5d 100644 --- a/kernel/inc/proc.h +++ b/kernel/inc/proc.h @@ -17,7 +17,7 @@ #define GDT_USER_CODE_OFFSET 0x1b // User code segment offset in GDT (with ring3 mask) #define GDT_USER_DATA_OFFSET 0x23 // User data segment offset in GDT (with ring3 mask) -enum proc_state { PROC_DEFAULT, PROC_IN_EVENT, PROC_RESOLVED }; +enum proc_state { PROC_DEFAULT }; struct proc { u32 pid; |