From 09a66e91ec9e8a677aa48f27798753084f213713 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 9 May 2020 17:39:31 +0200
Subject: Replaced fork() with spawn()!

Who needs forks anyway
---
 src/userspace/programs/init.c | 26 ++++++--------------------
 src/userspace/programs/root.c | 15 ---------------
 src/userspace/programs/sh.c   |  6 ++++++
 3 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 src/userspace/programs/root.c

(limited to 'src/userspace/programs')

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
diff --git a/src/userspace/programs/root.c b/src/userspace/programs/root.c
deleted file mode 100644
index 86b8bf7..0000000
--- a/src/userspace/programs/root.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include <syscall.h>
-#include <unistd.h>
-
-// This process only exists because it can't crash
-void main()
-{
-	if (get_pid() != 1) {
-		printf("Wrong PID!\n");
-		exit(1);
-	}
-
-	exec("/bin/init");
-	printf("The init process crashed!");
-}
\ No newline at end of file
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index f8f93f3..ba6ba8f 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -6,6 +6,11 @@
 #include <syscall.h>
 #include <unistd.h>
 
+void test(u8 *data)
+{
+	printf(".");
+}
+
 void main()
 {
 	printf("[~] ");
@@ -13,6 +18,7 @@ void main()
 	/* while (1) { */
 	/* 	putch(getch()); */
 	/* } */
+	//syscall_map(MAP_KEYBOARD, (u32)&test);
 
 	/* syscall_halt(); */
 	while (1) {
-- 
cgit v1.2.3