aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kernel/syscall/actions/sys_wait.c24
-rw-r--r--src/kernel/syscall/syscall.c1
-rw-r--r--src/kernel/syscall/syscall.h2
-rw-r--r--src/kernel/tasks/process.c4
-rw-r--r--src/kernel/tasks/process.h4
-rw-r--r--src/shared/common.h11
-rw-r--r--src/userspace/libc/syscall.c2
-rw-r--r--src/userspace/libc/syscall.h2
-rw-r--r--src/userspace/libc/unistd.h4
-rw-r--r--src/userspace/libc/unistd/wait.c12
-rw-r--r--src/userspace/programs/init.c9
11 files changed, 60 insertions, 15 deletions
diff --git a/src/kernel/syscall/actions/sys_wait.c b/src/kernel/syscall/actions/sys_wait.c
new file mode 100644
index 0000000..7cea24f
--- /dev/null
+++ b/src/kernel/syscall/actions/sys_wait.c
@@ -0,0 +1,24 @@
+#include <tasks/process.h>
+
+u32 sys_wait(u32 pid, u32 *status, u32 options)
+{
+ u32 ret;
+
+ if (pid < 0) { // Wait for any process in gid to die
+ ret = process_wait_gid(pid * -1, status);
+ }
+
+ if (pid == -1) { // Wait for any child to be killed
+ ret = process_wait_gid(current_proc->pid, status);
+ }
+
+ if (pid == 0) { // Wait for siblings of this process to die
+ ret = process_wait_gid(current_proc->gid, status);
+ }
+
+ if (pid > 0) { // Wait for pid to die
+ ret = process_wait_pid(pid, status);
+ }
+
+ return ret;
+} \ No newline at end of file
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 958428a..f1ee003 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -15,6 +15,7 @@ u32 (*syscalls[])() = { [SYS_HALT] = (u32(*)())halt_loop, // DEBUG!
[SYS_READ] = sys_read,
[SYS_WRITE] = sys_write,
[SYS_EXEC] = sys_exec,
+ [SYS_WAIT] = sys_wait,
[SYS_GET_PID] = sys_get_pid,
[SYS_MALLOC] = sys_malloc,
[SYS_FREE] = sys_free,
diff --git a/src/kernel/syscall/syscall.h b/src/kernel/syscall/syscall.h
index bc52e74..c5167a4 100644
--- a/src/kernel/syscall/syscall.h
+++ b/src/kernel/syscall/syscall.h
@@ -18,6 +18,8 @@ u32 sys_write(char *path, u32 offset, u32 count, u8 *buf);
u32 sys_exec(char *path);
+u32 sys_wait(u32 pid, u32 *status, u32 options);
+
u32 sys_get_pid();
u32 sys_malloc(u32 count);
diff --git a/src/kernel/tasks/process.c b/src/kernel/tasks/process.c
index efacc1f..d2a75fd 100644
--- a/src/kernel/tasks/process.c
+++ b/src/kernel/tasks/process.c
@@ -84,7 +84,7 @@ u32 process_spawn(struct process *process)
return process->pid;
}
-int process_wait_gid(u32 gid, int *status)
+u32 process_wait_gid(u32 gid, u32 *status)
{
struct process *i = root;
@@ -101,7 +101,7 @@ int process_wait_gid(u32 gid, int *status)
return WAIT_OKAY;
}
-int process_wait_pid(u32 pid, int *status)
+u32 process_wait_pid(u32 pid, u32 *status)
{
struct process *i = current_proc->next;
diff --git a/src/kernel/tasks/process.h b/src/kernel/tasks/process.h
index bd6a6e7..9aae9bc 100644
--- a/src/kernel/tasks/process.h
+++ b/src/kernel/tasks/process.h
@@ -45,8 +45,8 @@ void process_wake(u32 pid);
u32 process_child(struct process *process, u32 pid);
u32 process_fork(u32 pid);
-int process_wait_gid(u32 gid, int *status);
-int process_wait_pid(u32 pid, int *status);
+u32 process_wait_gid(u32 gid, u32 *status);
+u32 process_wait_pid(u32 pid, u32 *status);
struct process *process_from_pid(u32 pid);
diff --git a/src/shared/common.h b/src/shared/common.h
index 9680b1b..3f2904c 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -8,11 +8,12 @@
#define SYS_READ 3 // Read file
#define SYS_WRITE 4 // Write file
#define SYS_EXEC 5 // Execute file
-#define SYS_GET_PID 6 // Get process id
-#define SYS_MALLOC 7 // Allocate memory
-#define SYS_FREE 8 // Free memory
-#define SYS_GET 9 // Get kernel variable
-#define SYS_MAP 10 // Map input to function
+#define SYS_WAIT 6 // Wait for PID
+#define SYS_GET_PID 7 // Get process id
+#define SYS_MALLOC 8 // Allocate memory
+#define SYS_FREE 9 // Free memory
+#define SYS_GET 10 // Get kernel variable
+#define SYS_MAP 11 // Map input to function
// Get
#define GET_FRAMEBUFFER 0
diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c
index d5c6708..4b5c200 100644
--- a/src/userspace/libc/syscall.c
+++ b/src/userspace/libc/syscall.c
@@ -17,6 +17,8 @@ DEFN_SYSCALL4(write, SYS_WRITE, char *, u32, u32, u8 *);
DEFN_SYSCALL1(exec, SYS_EXEC, char *);
+DEFN_SYSCALL3(wait, SYS_WAIT, u32, u32 *, u32);
+
DEFN_SYSCALL0(get_pid, SYS_GET_PID);
DEFN_SYSCALL1(malloc, SYS_MALLOC, u32);
diff --git a/src/userspace/libc/syscall.h b/src/userspace/libc/syscall.h
index 30925da..bd9d38d 100644
--- a/src/userspace/libc/syscall.h
+++ b/src/userspace/libc/syscall.h
@@ -80,6 +80,8 @@ DECL_SYSCALL4(write, char *, u32, u32, u8 *);
DECL_SYSCALL1(exec, char *);
+DECL_SYSCALL3(wait, u32, u32 *, u32);
+
DECL_SYSCALL0(get_pid);
DECL_SYSCALL1(malloc, u32);
diff --git a/src/userspace/libc/unistd.h b/src/userspace/libc/unistd.h
index ac0bacf..876f35c 100644
--- a/src/userspace/libc/unistd.h
+++ b/src/userspace/libc/unistd.h
@@ -15,4 +15,8 @@ u32 read(char *path, u32 offset, u32 count, u8 *buf);
u32 write(char *path, u32 offset, u32 count, u8 *buf);
+// These should be somewhere else ig
+u32 wait(u32 *status);
+u32 wait_pid(u32 pid, u32 *status, u32 options);
+
#endif \ No newline at end of file
diff --git a/src/userspace/libc/unistd/wait.c b/src/userspace/libc/unistd/wait.c
new file mode 100644
index 0000000..7c0a6fb
--- /dev/null
+++ b/src/userspace/libc/unistd/wait.c
@@ -0,0 +1,12 @@
+#include <stdint.h>
+#include <syscall.h>
+
+u32 wait_pid(u32 pid, u32 *status, u32 options)
+{
+ return syscall_wait(pid, status, options);
+}
+
+u32 wait(u32 *status)
+{
+ return wait_pid(-1, status, 0);
+} \ No newline at end of file
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 68d025c..f3ca614 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -10,16 +10,13 @@ void main()
// TODO: Fix page fault when mallocing
printf("Initializing userspace...\n");
- // TODO: Implement wait syscall
- int x;
- int f = fork();
+ u32 x;
+ u32 f = fork();
if (f == 0)
- ; //wait(&x);
+ wait(&x);
else
exec("/bin/sh");
- //syscall_exec("/bin/sh");
-
while (1) {
};
} \ No newline at end of file