X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fsystem.c;h=748c744f0c0abf0a2e3330fb1d823b7df4b664fe;hb=85362e8a4c919b58cd261345d29f26bae4ad75e2;hp=8fc2a1ccea4f8e7348f0a44d9c9bb909452da3fd;hpb=51ab5f489bc356940c95cc936fd0508e8f07ea97;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/system.c b/KernelLand/Kernel/system.c
index 8fc2a1cc..748c744f 100644
--- a/KernelLand/Kernel/system.c
+++ b/KernelLand/Kernel/system.c
@@ -4,14 +4,16 @@
  * system.c
  * - Architecture Independent System Init
  */
-#define DEBUG	0
+#define DEBUG	1
 #include <acess.h>
+#include <hal_proc.h>
 
 // === IMPORTS ===
 extern void	Arch_LoadBootModules(void);
 extern int	Modules_LoadBuiltins(void);
 extern void	Modules_SetBuiltinParams(char *Name, char *ArgString);
 extern void	Debug_SetKTerminal(const char *File);
+extern void	Timer_CallbackThread(void *);
 
 // === PROTOTYPES ===
 void	System_Init(char *Commandline);
@@ -29,6 +31,8 @@ char	*argv[32];
 // === CODE ===
 void System_Init(char *CommandLine)
 {
+	Proc_SpawnWorker(Timer_CallbackThread, NULL);
+
 	// Parse Kernel's Command Line
 	System_ParseCommandLine(CommandLine);
 	
@@ -41,11 +45,28 @@ void System_Init(char *CommandLine)
 	
 	// - Execute the Config Script
 	Log_Log("Config", "Spawning init '%s'", gsInitBinary);
-	Proc_Spawn(gsInitBinary);
+	if(Proc_Clone(CLONE_VM|CLONE_NOUSER) == 0)
+	{
+		const char	*args[] = {gsInitBinary, 0};
+		VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_READ|VFS_OPENFLAG_USER);	// 0: stdin
+		VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_WRITE|VFS_OPENFLAG_USER);	// 1: stdout
+		VFS_DuplicateFD(1, 2);	// 2: stderr
+		Proc_Execve(gsInitBinary, args, &args[1], 0);
+		Log_KernelPanic("System", "Unable to spawn init '%s'", gsInitBinary);
+	}
 	
 	// Set the debug to be echoed to the terminal
 	Log_Log("Config", "Kernel now echoes to VT7 (Ctrl-Alt-F8)");
-	Debug_SetKTerminal("/Devices/VTerm/7");
+	Debug_SetKTerminal("/Devices/pts/vt7");
+	
+	// Run a thread to reap unowned threads
+	for( ;; )
+	{
+		 int	status;
+		// TODO: Inform init when a thread dies
+		int tid = Threads_WaitTID(-1, &status);
+		Log_Debug("Thread0", "Thread %i exited with status %i", tid, status);
+	}
 }
 
 /**
@@ -66,7 +87,10 @@ void System_ParseCommandLine(char *ArgString)
 		// Eat Whitespace
 		while(*str == ' ')	str++;
 		// Check for the end of the string
-		if(*str == '\0') {	argc--;	break;}	
+		if(*str == '\0') {
+			argc--;
+			break;
+		}
 		argv[argc] = str;
 		if(*str == '"') {
 			while(*str && !(*str == '"' && str[-1] != '\\'))
@@ -153,7 +177,7 @@ void System_ParseVFS(char *Arg)
 	// - Symbolic Link <link>=<destination>
 	if(value[0] == '/')
 	{
-		Log_Log("Config", "Symbolic link '%s' pointing to '%s'", Arg, value);
+//		Log_Log("Config", "Symbolic link '%s' pointing to '%s'", Arg, value);
 		VFS_Symlink(Arg, value);
 	}
 	// - Mount <mountpoint>=<fs>:<device>
@@ -168,13 +192,13 @@ void System_ParseVFS(char *Arg)
 		}
 		// Create Mountpoint
 		if( (fd = VFS_Open(Arg, 0)) == -1 ) {
-			Log_Log("Config", "Creating directory '%s'", Arg, value);
+//			Log_Log("Config", "Creating directory '%s'", Arg, value);
 			VFS_MkDir( Arg );
 		} else {
 			VFS_Close(fd);
 		}
 		// Mount
-		Log_Log("Config", "Mounting '%s' to '%s' ('%s')", dev, Arg, value);
+//		Log_Log("Config", "Mounting '%s' to '%s' ('%s')", dev, Arg, value);
 		VFS_Mount(dev, Arg, value, "");
 	}
 }