Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[sys] wait(pid)

Browse Source
This commit is contained in:
Kevin Lange 2011-12-06 20:13:20 -06:00
parent d52e73e71e
commit dca46fffc4
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/core/syscall.c
View File

@ -82,6 +82,21 @@ static int write(int fd, char * ptr, int len) {
return out;
}
static int wait(unsigned int child) {
task_t * volatile child_task = gettask(child);
/* If the child task doesn't exist, bail */
if (!child_task) return -1;
/* Wait until it finishes (this is stupidly memory intensive,
* but we haven't actually implemented wait() yet, so there's
* not all that much we can do right now. */
while (child_task->finished == 0) {
if (child_task->finished != 0) break;
switch_task();
}
/* Grab the child's return value */
return child_task->retval;
}
static int open(const char * file, int flags, int mode) {
validate((void *)file);
fs_node_t * node = kopen(file, 0);
@ -195,25 +210,26 @@ static int setgraphicsoffset(int rows) {
static void syscall_handler(struct regs * r);
static uintptr_t syscalls[] = {
/* System Call Table */
(uintptr_t)&exit,
(uintptr_t)&exit, /* 0 */
(uintptr_t)&print,
(uintptr_t)&open,
(uintptr_t)&read,
(uintptr_t)&write,
(uintptr_t)&write, /* 4 */
(uintptr_t)&close,
(uintptr_t)&gettimeofday,
(uintptr_t)&execve,
(uintptr_t)&sys_fork,
(uintptr_t)&sys_fork, /* 8 */
(uintptr_t)&getpid,
(uintptr_t)&sys_sbrk,
(uintptr_t)&getgraphicsaddress,
(uintptr_t)&kbd_mode,
(uintptr_t)&kbd_mode, /* 12 */
(uintptr_t)&kbd_get,
(uintptr_t)&seek,
(uintptr_t)&stat,
(uintptr_t)&setgraphicsoffset,
(uintptr_t)&setgraphicsoffset, /* 16 */
(uintptr_t)&wait,
};
uint32_t num_syscalls = 17;
uint32_t num_syscalls = 18;
void
syscalls_install() {

2
kernel/include/syscall.h
View File

@ -65,7 +65,7 @@ DECL_SYSCALL0(getpid);
DECL_SYSCALL3(execve, char *, char **, char **);
DECL_SYSCALL0(fork);
DECL_SYSCALL2(kill, int, int);
DECL_SYSCALL1(wait, int *);
DECL_SYSCALL1(wait, unsigned int);
/* Memory management */
DECL_SYSCALL1(sbrk, int);

2
loader/syscall.c
View File

@ -11,3 +11,5 @@ DEFN_SYSCALL3(execve, 7, char *, char **, char **)
DEFN_SYSCALL0(fork, 8)
DEFN_SYSCALL0(getpid, 9)
DEFN_SYSCALL1(sbrk, 10, int)
DEFN_SYSCALL1(wait, 16, unsigned int)

4
userspace/esh.c
View File

@ -11,6 +11,8 @@
#include <stdlib.h>
#include <unistd.h>
DEFN_SYSCALL1(wait, 17, unsigned int);
int main(int argc, char ** argv) {
printf("I am pid %d\n", getpid());
char cwd[1024] = {'/',0};
@ -40,7 +42,7 @@ int main(int argc, char ** argv) {
printf("Executing %s!\n", tokens[0]);
execve(tokens[0], tokens, NULL);
} else {
printf("Waiting for process (%d) to finish.\n", f);
syscall_wait(f);
}
}
exit: