From 4286b14839c0c4ec016d816e426660f6685ae349 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 7 May 2020 18:10:22 +0200
Subject: Fixed many bugs with wait() and fork()

This also adds many race conditions which really need to be fixed..
---
 src/userspace/programs/init.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/userspace/programs/init.c')

diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index f3ca614..1d53ee8 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -7,16 +7,27 @@
 
 void main()
 {
+	if (get_pid() != 2) {
+		printf("Wrong PID!\n");
+		exit(1);
+	}
+
 	// TODO: Fix page fault when mallocing
 	printf("Initializing userspace...\n");
 
+	// TODO: Fix occasional race conditions with cli/sti
+	// TODO: Fix scheduler turning off randomly..
 	u32 x;
 	u32 f = fork();
-	if (f == 0)
+	if (f == 0) {
+		printf("Waiting...\n");
 		wait(&x);
-	else
+	} else {
+		printf("Executing...\n");
 		exec("/bin/sh");
+	}
 
 	while (1) {
+		//printf("B");
 	};
 }
\ No newline at end of file
-- 
cgit v1.2.3