From: John Hodge <tpg@mutabah.net>
Date: Fri, 20 Jan 2012 10:27:21 +0000 (+0800)
Subject: Kernel - Moved process cleanup to thread deletion code
X-Git-Tag: rel0.14~1
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=d548f7aba41d40a4cc419bcce6d18c0fde4e62f6;p=tpg%2Facess2.git

Kernel - Moved process cleanup to thread deletion code
---

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 879fbdda..a8873988 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -135,6 +135,9 @@ void Threads_Delete(tThread *Thread)
 {
 	// Set to dead
 	Thread->Status = THREAD_STAT_BURIED;
+
+	// Clear out process state
+	Proc_ClearThread(Thread);			
 	
 	// Free name
 	if( IsHeap(Thread->ThreadName) )
@@ -418,22 +421,17 @@ tTID Threads_WaitTID(int TID, int *Status)
 	// Specific Thread
 	if(TID > 0) {
 		tThread	*t = Threads_GetThread(TID);
-		 int	initStatus = t->Status;
 		tTID	ret;
 		
 		// Wait for the thread to die!
-		if(initStatus != THREAD_STAT_ZOMBIE) {
-			// TODO: Handle child also being suspended if wanted
-			while(t->Status != THREAD_STAT_ZOMBIE) {
-				Threads_Sleep();
-				Log_Debug("Threads", "%i waiting for %i, t->Status = %i",
-					Threads_GetTID(), t->TID, t->Status);
-			}
+		// TODO: Handle child also being suspended if wanted
+		while(t->Status != THREAD_STAT_ZOMBIE) {
+			Threads_Sleep();
+			Log_Debug("Threads", "%i waiting for %i, t->Status = %i",
+				Threads_GetTID(), t->TID, t->Status);
 		}
 		
 		// Set return status
-		Log_Debug("Threads", "%i waiting for %i, t->Status = %i",
-			Threads_GetTID(), t->TID, t->Status);
 		ret = t->TID;
 		switch(t->Status)
 		{
@@ -630,8 +628,6 @@ void Threads_Kill(tThread *Thread, int Status)
 	Thread->RetStatus = Status;
 
 	SHORTREL( &Thread->IsLocked );
-	// Clear out process state
-	Proc_ClearThread(Thread);			
 
 	Thread->Status = THREAD_STAT_ZOMBIE;
 	SHORTREL( &glThreadListLock );