X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fthreads.c;h=7dd9f6e929cb2cd0c13a8ac154ec623573df2605;hb=6b29d7427e7d1ad73f0a0d0ae771bd25da7b7f1a;hp=6099621166818402fba6238ef8dab9b1c149769e;hpb=6d6b367c4f5e413a9e4135d9f5c40077c3724525;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/threads.c b/KernelLand/Kernel/threads.c
index 60996211..7dd9f6e9 100644
--- a/KernelLand/Kernel/threads.c
+++ b/KernelLand/Kernel/threads.c
@@ -11,6 +11,7 @@
 #include <hal_proc.h>
 #include <semaphore.h>
 #include <vfs_threads.h>	// VFS Handle maintainence
+#include <events.h>
 
 // Configuration
 #define DEBUG_TRACE_TICKETS	0	// Trace ticket counts
@@ -442,9 +443,30 @@ tThread *Threads_CloneThreadZero(void)
 tTID Threads_WaitTID(int TID, int *Status)
 {	
 	// Any Child
-	if(TID == -1) {
-		Log_Error("Threads", "TODO: Threads_WaitTID(TID=-1) - Any Child");
-		return -1;
+	if(TID == -1)
+	{
+		Uint32 ev = Threads_WaitEvents(THREAD_EVENT_DEADCHILD);
+		tTID	ret = -1;
+		if( ev & THREAD_EVENT_DEADCHILD )
+		{
+			// A child died, get the TID
+			tThread	*us = Proc_GetCurThread();
+			ASSERT(us->LastDeadChild);
+			ret = us->LastDeadChild->TID;
+			// - Mark as dead (as opposed to undead)
+			ASSERT(us->LastDeadChild->Status == THREAD_STAT_ZOMBIE);
+			us->LastDeadChild->Status = THREAD_STAT_DEAD;
+			// - Set return status
+			if(Status)
+				*Status = us->LastDeadChild->RetStatus;
+			us->LastDeadChild = NULL;
+			Mutex_Release(&us->DeadChildLock);
+		}
+		else
+		{
+			Log_Error("Threads", "TODO: Threads_WaitTID(TID=-1) - Any Child");
+		}
+		return ret;
 	}
 	
 	// Any peer/child thread
@@ -460,33 +482,14 @@ tTID Threads_WaitTID(int TID, int *Status)
 	}
 	
 	// Specific Thread
-	if(TID > 0) {
-		tThread	*t = Threads_GetThread(TID);
+	if(TID > 0)
+	{
 		tTID	ret;
-		
-		// Wait for the thread to die!
-		// 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
-		ret = t->TID;
-		switch(t->Status)
+		// NOTE: Race condition - Other child dies, desired child dies, first death is 'lost'
+		while( (ret = Threads_WaitTID(-1, Status)) != TID )
 		{
-		case THREAD_STAT_ZOMBIE:
-			// Kill the thread
-			t->Status = THREAD_STAT_DEAD;
-			// TODO: Child return value?
-			if(Status)	*Status = t->RetStatus;
-			// add to delete queue
-			Threads_Delete( t );
-			break;
-		default:
-			if(Status)	*Status = -1;
-			break;
+			if( ret == -1 )
+				break;
 		}
 		return ret;
 	}
@@ -504,15 +507,13 @@ tThread *Threads_GetThread(Uint TID)
 	tThread *thread;
 	
 	// Search global list
-	for(thread = gAllThreads;
-		thread;
-		thread = thread->GlobalNext)
+	for( thread = gAllThreads; thread; thread = thread->GlobalNext )
 	{
 		if(thread->TID == TID)
 			return thread;
 	}
 
-	Log("Unable to find TID %i on main list\n", TID);
+	Log_Notice("Threads", "Unable to find TID %i on main list\n", TID);
 	
 	return NULL;
 }
@@ -687,8 +688,10 @@ void Threads_Kill(tThread *Thread, int Status)
 
 	Thread->Status = THREAD_STAT_ZOMBIE;
 	SHORTREL( &glThreadListLock );
-	// TODO: Send something like SIGCHLD
-	Threads_Wake( Thread->Parent );
+	// TODO: It's possible that we could be timer-preempted here, should disable that... somehow
+	Mutex_Acquire( &Thread->Parent->DeadChildLock );	// released by parent
+	Thread->Parent->LastDeadChild = Thread;
+	Threads_PostEvent( Thread->Parent, THREAD_EVENT_DEADCHILD );
 	
 	Log("Thread %i went *hurk* (%i)", Thread->TID, Status);
 	
@@ -709,6 +712,22 @@ void Threads_Yield(void)
 	Proc_Reschedule();
 }
 
+/**
+ * \breif Wait for the thread status to not be a specified value
+ */
+void Threads_int_WaitForStatusEnd(enum eThreadStatus Status)
+{
+	tThread	*us = Proc_GetCurThread();
+	ASSERT(Status != THREAD_STAT_ACTIVE);
+	ASSERT(Status != THREAD_STAT_DEAD);
+	while( us->Status == Status )
+	{
+		Proc_Reschedule();
+		if( us->Status == Status )
+			Debug("Thread %p(%i %s) rescheduled while in %s state", casTHREAD_STAT[Status]);
+	}
+}
+
 /**
  * \fn void Threads_Sleep(void)
  * \brief Take the current process off the run queue
@@ -740,12 +759,7 @@ void Threads_Sleep(void)
 	
 	// Release Spinlock
 	SHORTREL( &glThreadListLock );
-
-	while(cur->Status != THREAD_STAT_ACTIVE) {
-		Proc_Reschedule();
-		if( cur->Status != THREAD_STAT_ACTIVE )
-			Log("%i - Huh? why am I up? zzzz...", cur->TID);
-	}
+	Threads_int_WaitForStatusEnd(THREAD_STAT_SLEEPING);
 }
 
 
@@ -767,11 +781,11 @@ int Threads_Wake(tThread *Thread)
 		return -EALREADY;
 	
 	case THREAD_STAT_SLEEPING:
-		SHORTLOCK( &glThreadListLock );
 		// Remove from sleeping queue
+		SHORTLOCK( &glThreadListLock );
 		Threads_int_DelFromQueue(&gSleepingThreads, Thread);
-		
 		SHORTREL( &glThreadListLock );
+		
 		Threads_AddActive( Thread );
 		
 		#if DEBUG_TRACE_STATE
@@ -837,7 +851,7 @@ int Threads_Wake(tThread *Thread)
 		return -ENOTIMPL;
 	
 	default:
-		Warning("Threads_Wake - Unknown process status (%i)\n", Thread->Status);
+		Log_Warning("Threads", "Threads_Wake - Unknown process status (%i)", Thread->Status);
 		return -EINTERNAL;
 	}
 }
@@ -1081,7 +1095,7 @@ void Threads_int_DumpThread(tThread *thread)
 	default:	break;
 	}
 	Log("  Priority %i, Quantum %i", thread->Priority, thread->Quantum);
-	Log("  KStack 0x%x", thread->KernelStack);
+	Log("  KStack %p", thread->KernelStack);
 	if( thread->bInstrTrace )
 		Log("  Tracing Enabled");
 	Proc_DumpThreadCPUState(thread);