diff options
| author | Marvin Borner | 2020-05-09 17:39:31 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-05-09 17:39:31 +0200 |
| commit | 09a66e91ec9e8a677aa48f27798753084f213713 (patch) | |
| tree | 9685a13b459e60d830179c565417ed72ae855ebe /src/userspace/programs/init.c | |
| parent | 3a97fef4bb4780e4bc2423699063d40cbf5da923 (diff) | |
Replaced fork() with spawn()!
Who needs forks anyway
Diffstat (limited to 'src/userspace/programs/init.c')
| -rw-r--r-- | src/userspace/programs/init.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c index 6cb80ce..1f6d0a3 100644 --- a/src/userspace/programs/init.c +++ b/src/userspace/programs/init.c @@ -5,14 +5,9 @@ #include <syscall.h> #include <unistd.h> -void test(u8 *data) -{ - printf("."); -} - void main() { - if (get_pid() != 2) { + if (get_pid() != 1) { printf("Wrong PID!\n"); exit(1); } @@ -20,22 +15,13 @@ void main() // TODO: Fix page fault when mallocing printf("Initializing userspace...\n"); - // TODO: Find out, why init gets PID 1 and stops - syscall_map(MAP_KEYBOARD, (u32)&test); - + // TODO: Find out, why processes change pid randomly // TODO: Fix occasional race conditions with cli/sti - // TODO: Fix scheduler turning off randomly.. - /* u32 x; */ - /* u32 f = fork(); */ - /* if (f == 0) { */ - /* printf("Waiting...\n"); */ - /* wait(&x); */ - /* } else { */ - /* printf("Executing...\n"); */ - /* exec("/bin/sh"); */ - /* } */ + // TODO: Fix scheduler turning off at some point + spawn("/bin/sh"); + printf("ok"); while (1) { //printf("B"); }; -} +}
\ No newline at end of file |