X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=879fbdda1e5bb55a6177f410f3b01098957bc3a4;hb=ae3a0bf446529bfb50eb91a0fb90b72140d9f2ed;hp=d1f3a75483dcf45e0bb77b783a84ca9e436ae8ab;hpb=340bda1dddf444ccf46fbc9e7a37bf6c3f0aeb6a;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index d1f3a754..879fbdda 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -26,7 +26,7 @@
 #define	DEFAULT_QUANTUM	5
 #define	DEFAULT_PRIORITY	5
 #define MIN_PRIORITY		10
-const enum eConfigTypes	cCONFIG_TYPES[] = {
+const enum eConfigTypes	cCONFIG_TYPES[NUM_CFG_ENTRIES] = {
 	CFGT_HEAPSTR,	// e.g. CFG_VFS_CWD
 	CFGT_INT,	// e.g. CFG_VFS_MAXFILES
 	CFGT_NULL
@@ -37,6 +37,7 @@ const enum eConfigTypes	cCONFIG_TYPES[] = {
 // === PROTOTYPES ===
 void	Threads_Init(void);
 #if 0
+void	Threads_Delete(tThread *Thread);
  int	Threads_SetName(const char *NewName);
 #endif
 char	*Threads_GetName(int ID);
@@ -46,7 +47,6 @@ tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
  int	Threads_WaitTID(int TID, int *status);
 tThread	*Threads_GetThread(Uint TID);
 #endif
-void	Threads_AddToDelete(tThread *Thread);
 tThread	*Threads_int_DelFromQueue(tThread **List, tThread *Thread);
 #if 0
 void	Threads_Exit(int TID, int Status);
@@ -90,7 +90,6 @@ volatile Uint	giNextTID = 1;	// Next TID to allocate
 // --- Thread Lists ---
 tThread	*gAllThreads = NULL;		// All allocated threads
 tThread	*gSleepingThreads = NULL;	// Sleeping Threads
-tThread	*gDeleteThreads = NULL;		// Threads to delete
  int	giNumCPUs = 1;	// Number of CPUs
 BOOL     gaThreads_NoTaskSwitch[MAX_CPUS];	// Disables task switches for each core (Pseudo-IF)
 // --- Scheduler Types ---
@@ -132,6 +131,25 @@ void Threads_Init(void)
 	Proc_Start();
 }
 
+void Threads_Delete(tThread *Thread)
+{
+	// Set to dead
+	Thread->Status = THREAD_STAT_BURIED;
+	
+	// Free name
+	if( IsHeap(Thread->ThreadName) )
+		free(Thread->ThreadName);
+	
+	// Remove from global list
+	// TODO: Lock this too
+	if( Thread == gAllThreads )
+		gAllThreads = Thread->GlobalNext;
+	else
+		Thread->GlobalPrev->GlobalNext = Thread->GlobalNext;
+	
+	free(Thread);
+}
+
 /**
  * \fn void Threads_SetName(const char *NewName)
  * \brief Sets the current thread's name
@@ -425,7 +443,7 @@ tTID Threads_WaitTID(int TID, int *Status)
 			// TODO: Child return value?
 			if(Status)	*Status = t->RetStatus;
 			// add to delete queue
-			Threads_AddToDelete( t );
+			Threads_Delete( t );
 			break;
 		default:
 			if(Status)	*Status = -1;
@@ -460,23 +478,6 @@ tThread *Threads_GetThread(Uint TID)
 	return NULL;
 }
 
-/**
- * \brief Adds a thread to the delete queue
- * \param Thread	Thread to delete
- */
-void Threads_AddToDelete(tThread *Thread)
-{
-	// Add to delete queue
-	// TODO: Is locking needed?
-	if(gDeleteThreads) {
-		Thread->Next = gDeleteThreads;
-		gDeleteThreads = Thread;
-	} else {
-		Thread->Next = NULL;
-		gDeleteThreads = Thread;
-	}
-}
-
 /**
  * \brief Deletes an entry from a list
  * \param List	Pointer to the list head
@@ -537,17 +538,17 @@ void Threads_Kill(tThread *Thread, int Status)
 	tMsg	*msg;
 	 int	isCurThread = Thread == Proc_GetCurThread();
 	
-	// TODO: Kill all children
+	// TODO: Disown all children?
 	#if 1
 	{
 		tThread	*child;
-		// TODO: I should keep a .Parent pointer, and a .Children list
+		// TODO: I should keep a .Children list
 		for(child = gAllThreads;
 			child;
 			child = child->GlobalNext)
 		{
 			if(child->Parent == Thread)
-				Threads_Kill(child, -1);
+				child->Parent = &gThreadZero;
 		}
 	}
 	#endif
@@ -629,19 +630,13 @@ void Threads_Kill(tThread *Thread, int Status)
 	Thread->RetStatus = Status;
 
 	SHORTREL( &Thread->IsLocked );
+	// Clear out process state
+	Proc_ClearThread(Thread);			
 
-	// Don't Zombie if we are being killed because our parent is
-	if(Status == -1)
-	{
-		Thread->Status = THREAD_STAT_DEAD;
-		Threads_AddToDelete( Thread );
-		SHORTREL( &glThreadListLock );
-	} else {
-		Thread->Status = THREAD_STAT_ZOMBIE;
-		SHORTREL( &glThreadListLock );
-		// Wake parent
-		Threads_Wake( Thread->Parent );
-	}
+	Thread->Status = THREAD_STAT_ZOMBIE;
+	SHORTREL( &glThreadListLock );
+	// TODO: Send something like SIGCHLD
+	Threads_Wake( Thread->Parent );
 	
 	Log("Thread %i went *hurk* (%i)", Thread->TID, Status);
 	
@@ -1125,31 +1120,6 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	// Lock thread list
 	SHORTLOCK( &glThreadListLock );
 	
-	// Clear Delete Queue
-	// - I should probably put this in a worker thread to avoid calling free() in the scheduler
-	//   DEFINITELY - free() can deadlock in this case
-	//   I'll do it when it becomes an issue
-	while(gDeleteThreads)
-	{
-		thread = gDeleteThreads->Next;
-		// Only free if structure is unused
-		if( !IS_LOCKED(&gDeleteThreads->IsLocked) )
-		{
-			// Set to dead
-			gDeleteThreads->Status = THREAD_STAT_BURIED;
-			// Free name
-			if( IsHeap(gDeleteThreads->ThreadName) )
-				free(gDeleteThreads->ThreadName);
-			// Remove from global list
-			if( gDeleteThreads == gAllThreads )
-				gAllThreads = gDeleteThreads->GlobalNext;
-			else
-				gDeleteThreads->GlobalPrev->GlobalNext = gDeleteThreads->GlobalNext;
-			free( gDeleteThreads );
-		}
-		gDeleteThreads = thread;
-	}
-
 	// Make sure the current (well, old) thread is marked as de-scheduled	
 	if(Last)	Last->CurCPU = -1;