diff options
| author | Marvin Borner | 2021-04-02 01:27:36 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-02 01:27:36 +0200 |
| commit | 192b756a6999a0637fcc72f3fd2f9f7099e32543 (patch) | |
| tree | f936c42baeb54c8aebd0fc0ac0cb56f9dcf3c96c /kernel/features/syscall.c | |
| parent | afa00abb2b68205bee539d7947130d6b1b1ec6e9 (diff) | |
Huge scheduling/proc-management improvements
Diffstat (limited to 'kernel/features/syscall.c')
| -rw-r--r-- | kernel/features/syscall.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c index 44caff8..ab14539 100644 --- a/kernel/features/syscall.c +++ b/kernel/features/syscall.c @@ -50,7 +50,7 @@ static void syscall_handler(struct regs *r) if (vfs_ready((char *)r->ebx)) { r->eax = (u32)vfs_read((char *)r->ebx, (void *)r->ecx, r->edx, r->esi); } else { - res wait = vfs_wait((char *)r->ebx, (u32)vfs_read); + res wait = vfs_block((char *)r->ebx, (u32)vfs_read); if (wait != 0) r->eax = wait; else @@ -70,7 +70,7 @@ static void syscall_handler(struct regs *r) case SYS_POLL: { res ret = vfs_poll((const char **)r->ebx); r->eax = ret; - if (ret == PROC_MAX_WAIT_IDS + 1) + if (ret == PROC_MAX_BLOCK_IDS + 1) proc_yield(r); break; } @@ -78,8 +78,8 @@ static void syscall_handler(struct regs *r) char *path = (char *)r->ebx; struct proc *proc = proc_make(PROC_PRIV_NONE); r->eax = (u32)elf_load(path, proc); - if (r->eax != 0) { - proc_exit(proc, -r->eax); + if (r->eax != EOK) { + proc_exit(proc, r, -r->eax); } else { // TODO: Reimplement argc,argv proc_stack_push(proc, 0); @@ -88,8 +88,7 @@ static void syscall_handler(struct regs *r) break; } case SYS_EXIT: { - proc_exit(proc_current(), (s32)r->ebx); - proc_yield(r); + proc_exit(proc_current(), r, (s32)r->ebx); break; } case SYS_BOOT: { // TODO: Move |