X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fthreads.c;h=714b2b094173cfb5447f59e4452f51693787b4cf;hb=a61b28e45899df847f74da32bddf24c673a7d91c;hp=27356613be9b79bbf7b0a28034f2c63c0e11c3f5;hpb=35e419b3110ef56ffdc3f16c1fc819874b888ba5;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 27356613..714b2b09 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -13,6 +13,7 @@
 
 // === IMPORTS ===
 extern void	ArchThreads_Init();
+extern void	Proc_Start();
 extern tThread	*Proc_GetCurThread();
 extern int	Proc_Clone(Uint *Err, Uint Flags);
 
@@ -22,6 +23,7 @@ void	Threads_SetName(char *NewName);
 void	Threads_SetTickets(int Num);
  int	Threads_WaitTID(int TID, int *status);
 tThread	*Threads_GetThread(Uint TID);
+void	Threads_AddToDelete(tThread *Thread);
 tThread	*Threads_int_GetPrev(tThread **List, tThread *Thread);
 void	Threads_Exit(int TID, int Status);
 void	Threads_Kill(tThread *Thread, int Status);
@@ -91,9 +93,15 @@ void Threads_Init()
 		cur->ThreadName = "Idle Thread";
 		Threads_SetTickets(0);	// Never called randomly
 		cur->Quantum = 1;	// 1 slice quantum
-		for(;;)	__asm__ __volatile__ ("hlt");	// Just yeilds
+		for(;;) {
+			Log("---- Idle");
+			Threads_Dump();
+			__asm__ __volatile__ ("hlt");	// Just yeilds
+		}
 	}
 	#endif
+	
+	Proc_Start();
 }
 
 /**
@@ -133,6 +141,8 @@ void Threads_SetTickets(int Num)
  */
 int Threads_WaitTID(int TID, int *status)
 {
+	Threads_Dump();
+	
 	// Any Child
 	if(TID == -1) {
 		
@@ -161,10 +171,11 @@ int Threads_WaitTID(int TID, int *status)
 		{
 		case THREAD_STAT_ZOMBIE:
 			t->Status = THREAD_STAT_DEAD;
-			*status = 0;
+			if(status)	*status = 0;
+			Threads_AddToDelete( t );
 			break;
 		default:
-			*status = -1;
+			if(status)	*status = -1;
 			break;
 		}
 		return ret;
@@ -202,6 +213,22 @@ tThread *Threads_GetThread(Uint TID)
 	return NULL;
 }
 
+/**
+ * \fn void Threads_AddToDelete(tThread *Thread)
+ * \brief Adds a thread to the delete queue
+ */
+void Threads_AddToDelete(tThread *Thread)
+{
+	// Add to delete queue
+	if(gDeleteThreads) {
+		Thread->Next = gDeleteThreads;
+		gDeleteThreads = Thread;
+	} else {
+		Thread->Next = NULL;
+		gDeleteThreads = Thread;
+	}
+}
+
 /**
  * \fn tThread *Threads_int_GetPrev(tThread *List, tThread *Thread)
  * \brief Gets the previous entry in a thead linked list
@@ -295,14 +322,7 @@ void Threads_Kill(tThread *Thread, int Status)
 	if(Status == -1)
 	{
 		Thread->Status = THREAD_STAT_DEAD;
-		// Add to delete queue
-		if(gDeleteThreads) {
-			Thread->Next = gDeleteThreads;
-			gDeleteThreads = Thread;
-		} else {
-			Thread->Next = NULL;
-			gDeleteThreads = Thread;
-		}
+		Threads_AddToDelete( Thread );
 	} else {
 		Thread->Status = THREAD_STAT_ZOMBIE;
 	}
@@ -319,7 +339,7 @@ void Threads_Kill(tThread *Thread, int Status)
  */
 void Threads_Yield()
 {
-	Proc_GetCurThread()->Quantum = 0;
+	Proc_GetCurThread()->Remaining = 0;
 	HALT();
 }
 
@@ -332,7 +352,7 @@ void Threads_Sleep()
 	tThread *cur = Proc_GetCurThread();
 	tThread *thread;
 	
-	//Log("Proc_Sleep: %i going to sleep", gCurrentThread->TID);
+	Log("Proc_Sleep: %i going to sleep", cur->TID);
 	
 	// Acquire Spinlock
 	LOCK( &giThreadListLock );