X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fthreads.c;h=80b2796680d39dba3c344d1b54aec7dc2f8b8140;hb=5cab4c07bc13888dc7956194ef9595508072a4eb;hp=193ddfed23fe851c8ce497e800eb0622beb4d879;hpb=fa69f30b715df80fed85e7a976deeb3eeea2ef28;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/threads.c b/KernelLand/Kernel/threads.c
index 193ddfed..80b27966 100644
--- a/KernelLand/Kernel/threads.c
+++ b/KernelLand/Kernel/threads.c
@@ -13,6 +13,7 @@
 #include <rwlock.h>
 #include <vfs_threads.h>	// VFS Handle maintainence
 #include <events.h>
+#include <debug_hooks.h>
 
 // Configuration
 #define DEBUG_TRACE_ACTIVEQUEUE	0	// Trace adds/removals from the active queue
@@ -70,8 +71,8 @@ void	Threads_Sleep(void);
  int	Threads_Wake(tThread *Thread);
 void	Threads_AddActive(tThread *Thread);
 tThread	*Threads_RemActive(void);
-#endif
 void	Threads_ToggleTrace(int TID);
+#endif
 void	Threads_Fault(int Num);
 void	Threads_SegFault(tVAddr Addr);
 void	Threads_PostSignalTo(tThread *Thread, int SignalNum);
@@ -91,7 +92,9 @@ tGID	Threads_GetGID(void);
  int	Threads_SetGID(Uint *Errno, tUID ID);
 #endif
 void	Threads_int_DumpThread(tThread *thread);
+#if 0
 void	Threads_Dump(void);
+#endif
 void	Threads_DumpActive(void);
 tThread	*Threads_int_GetRunnable(void);
 
@@ -195,7 +198,7 @@ void Threads_Delete(tThread *Thread)
 			proc->Next->Prev = proc->Prev;
 
 		// VFS Cleanup
-		VFS_CloseAllUserHandles();
+		VFS_CloseAllUserHandles( proc );
 		// Architecture cleanup
 		Proc_ClearProcess( proc );
 		// VFS Configuration strings
@@ -352,7 +355,7 @@ tThread *Threads_CloneTCB(Uint Flags)
 	if(Flags & CLONE_VM) {
 		tProcess	*newproc, *oldproc;
 		oldproc = cur->Process;
-		new->Process = malloc( sizeof(struct sProcess) );
+		new->Process = calloc( sizeof(struct sProcess), 1 );
 		newproc = new->Process;
 		newproc->PID = new->TID;
 		if( Flags & CLONE_PGID )
@@ -477,18 +480,26 @@ tTID Threads_WaitTID(int TID, int *Status)
 		tTID	ret = -1;
 		if( ev & THREAD_EVENT_DEADCHILD )
 		{
+			tThread	* const us = Proc_GetCurThread();
 			// A child died, get the TID
-			tThread	*us = Proc_GetCurThread();
 			ASSERT(us->LastDeadChild);
-			ret = us->LastDeadChild->TID;
+			tThread	*dead_thread = us->LastDeadChild;
+			us->LastDeadChild = dead_thread->Next;
+			if( us->LastDeadChild )
+				Threads_PostEvent( us, THREAD_EVENT_DEADCHILD );
+			else
+				Threads_ClearEvent( THREAD_EVENT_DEADCHILD );
+			Mutex_Release(&us->DeadChildLock);
+			
+			ret = dead_thread->TID;
 			// - Mark as dead (as opposed to undead)
-			ASSERT(us->LastDeadChild->Status == THREAD_STAT_ZOMBIE);
-			us->LastDeadChild->Status = THREAD_STAT_DEAD;
+			ASSERTC(dead_thread->Status, ==, THREAD_STAT_ZOMBIE);
+			dead_thread->Status = THREAD_STAT_DEAD;
 			// - Set return status
 			if(Status)
-				*Status = us->LastDeadChild->RetStatus;
-			us->LastDeadChild = NULL;
-			Mutex_Release(&us->DeadChildLock);
+				*Status = dead_thread->RetStatus;
+			
+			Threads_Delete( dead_thread );
 		}
 		else
 		{
@@ -719,9 +730,11 @@ void Threads_Kill(tThread *Thread, int Status)
 	SHORTREL( &glThreadListLock );
 	// TODO: It's possible that we could be timer-preempted here, should disable that... somehow
 	Mutex_Acquire( &Thread->Parent->DeadChildLock );	// released by parent
+	Thread->Next = Thread->Parent->LastDeadChild;
 	Thread->Parent->LastDeadChild = Thread;
 	Threads_PostEvent( Thread->Parent, THREAD_EVENT_DEADCHILD );
 	
+	// Process cleanup happens on reaping
 	Log("Thread %i went *hurk* (%i)", Thread->TID, Status);
 	
 	// And, reschedule
@@ -780,9 +793,13 @@ int Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **L
 		}
 		*ListTail = us;
 	}
-	else {
+	else if( ListHead ) {
+		us->Next = *ListHead;
 		*ListHead = us;
 	}
+	else {
+		// Nothing
+	}
 	
 	//if( Proc_ThreadSync(us) )
 	//	return ;
@@ -1239,17 +1256,20 @@ int *Threads_GetErrno(void)
 }
 
 // --- Configuration ---
-int *Threads_GetMaxFD(void)
+int *Threads_GetMaxFD(tProcess *Process)
 {
-	return &Proc_GetCurThread()->Process->MaxFD;
+	if(!Process)	Process = Proc_GetCurThread()->Process;
+	return &Process->MaxFD;
 }
-char **Threads_GetChroot(void)
+char **Threads_GetChroot(tProcess *Process)
 {
-	return &Proc_GetCurThread()->Process->RootDir;
+	if(!Process)	Process = Proc_GetCurThread()->Process;
+	return &Process->RootDir;
 }
-char **Threads_GetCWD(void)
+char **Threads_GetCWD(tProcess *Process)
 {
-	return &Proc_GetCurThread()->Process->CurrentWorkingDir;
+	if(!Process)	Process = Proc_GetCurThread()->Process;
+	return &Process->CurrentWorkingDir;
 }
 // ---
 
@@ -1307,22 +1327,16 @@ void Threads_int_DumpThread(tThread *thread)
  */
 void Threads_DumpActive(void)
 {
-	tThread	*thread;
-	tThreadList	*list;
-	#if SCHEDULER_TYPE == SCHED_RR_PRI
-	 int	i;
-	#endif
-	
 	Log("Active Threads: (%i reported)", giNumActiveThreads);
 	
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
-	for( i = 0; i < MIN_PRIORITY+1; i++ )
+	for( int i = 0; i < MIN_PRIORITY+1; i++ )
 	{
-		list = &gaActiveThreads[i];
+		tThreadList *list = &gaActiveThreads[i];
 	#else
-		list = &gActiveThreads;
+		tThreadList *list = &gActiveThreads;
 	#endif
-		for(thread=list->Head;thread;thread=thread->Next)
+		for(tThread *thread = list->Head; thread; thread = thread->Next)
 		{
 			Threads_int_DumpThread(thread);
 			if(thread->Status != THREAD_STAT_ACTIVE)