X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=76041f58b4f713533786339488d690f134e2378b;hb=cab8da0bb96d6450c32bd5b77d8f240394e257ce;hp=7114745ac09d6b3af4139199ffe308f6f27163fb;hpb=28eafc7611ec3d3f840845ec2b54025affd7bc1e;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 7114745a..76041f58 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -124,6 +124,7 @@ void Threads_Init(void)
 	
 	Log_Debug("Threads", "Offsets of tThread");
 	Log_Debug("Threads", ".Priority = %i", offsetof(tThread, Priority));
+	Log_Debug("Threads", ".KernelStack = %i", offsetof(tThread, KernelStack));
 	
 	// Create Initial Task
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -232,12 +233,10 @@ void Threads_SetPriority(tThread *Thread, int Pri)
 }
 
 /**
- * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
  * \brief Clone the TCB of the current thread
- * \param Err	Error pointer
  * \param Flags	Flags for something... (What is this for?)
  */
-tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
+tThread *Threads_CloneTCB(Uint Flags)
 {
 	tThread	*cur, *new;
 	 int	i;
@@ -245,7 +244,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
 	
 	// Allocate and duplicate
 	new = malloc(sizeof(tThread));
-	if(new == NULL) { *Err = -ENOMEM; return NULL; }
+	if(new == NULL) { errno = -ENOMEM; return NULL; }
 	memcpy(new, cur, sizeof(tThread));
 	
 	new->CurCPU = -1;
@@ -308,8 +307,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
 }
 
 /**
- * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags)
- * \brief Clone the TCB of the current thread
+ * \brief Clone the TCB of the kernel thread
  */
 tThread *Threads_CloneThreadZero(void)
 {
@@ -667,9 +665,10 @@ void Threads_Kill(tThread *Thread, int Status)
 	SHORTREL( &Thread->IsLocked );	// TODO: We may not actually be released...
 	
 	// And, reschedule
-	if(isCurThread) {
+	if(isCurThread)
+	{
 		for( ;; )
-			HALT();
+			Proc_Reschedule();
 	}
 }
 
@@ -678,10 +677,7 @@ void Threads_Kill(tThread *Thread, int Status)
  */
 void Threads_Yield(void)
 {
-	tThread	*thread = Proc_GetCurThread();
-	thread->Remaining = 0;
-	//while(thread->Remaining == 0)
-		HALT();
+	Proc_Reschedule();
 }
 
 /**
@@ -717,8 +713,12 @@ void Threads_Sleep(void)
 	
 	// Release Spinlock
 	SHORTREL( &glThreadListLock );
-	
-	while(cur->Status != THREAD_STAT_ACTIVE)	HALT();
+
+	while(cur->Status != THREAD_STAT_ACTIVE) {
+		Proc_Reschedule();
+		if( cur->Status != THREAD_STAT_ACTIVE )
+			Log("%i - Huh? why am I up? zzzz...", cur->TID);
+	}
 }
 
 
@@ -849,7 +849,8 @@ void Threads_AddActive(tThread *Thread)
 	
 	if( Thread->Status == THREAD_STAT_ACTIVE ) {
 		tThread	*cur = Proc_GetCurThread();
-		Warning("WTF, CPU%i %p (%i %s) is adding %p (%i %s) when it is active",
+		Log_Warning("Threads", "WTF, %p CPU%i %p (%i %s) is adding %p (%i %s) when it is active",
+			__builtin_return_address(0),
 			GetCPUNum(), cur, cur->TID, cur->ThreadName, Thread, Thread->TID, Thread->ThreadName);
 		SHORTREL( &glThreadListLock );
 		return ;
@@ -904,14 +905,17 @@ void Threads_AddActive(tThread *Thread)
 
 /**
  * \brief Removes the current thread from the active queue
- * \warning This should ONLY be called with task switches disabled
+ * \warning This should ONLY be called with the lock held
  * \return Current thread pointer
  */
 tThread *Threads_RemActive(void)
 {
 	tThread	*ret = Proc_GetCurThread();
-	
-	SHORTLOCK( &glThreadListLock );
+
+	if( !IS_LOCKED(&glThreadListLock) ) {
+		Log_KernelPanic("Threads", "Threads_RemActive called without lock held");
+		return NULL;
+	}
 	
 	// Delete from active queue
 	#if SCHEDULER_TYPE == SCHED_RR_PRI
@@ -938,8 +942,6 @@ tThread *Threads_RemActive(void)
 		GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
 	#endif
 	
-	SHORTREL( &glThreadListLock );
-	
 	return ret;
 }
 
@@ -979,6 +981,7 @@ void Threads_Fault(int Num)
 	
 	// Double Fault? Oh, F**k
 	if(thread->CurFaultNum != 0) {
+		Log_Warning("Threads", "Threads_Fault: Double fault on %i", thread->TID);
 		Threads_Kill(thread, -1);	// For now, just kill
 		HALT();
 	}
@@ -994,7 +997,10 @@ void Threads_Fault(int Num)
  */
 void Threads_SegFault(tVAddr Addr)
 {
-	Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr);
+	tThread	*cur = Proc_GetCurThread();
+	cur->bInstrTrace = 0;
+	Log_Warning("Threads", "Thread #%i committed a segfault at address %p", cur->TID, Addr);
+	MM_DumpTables(0, USER_MAX);
 	Threads_Fault( 1 );
 	//Threads_Exit( 0, -1 );
 }
@@ -1136,7 +1142,6 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	if( gaThreads_NoTaskSwitch[CPU] )
 		return Last;
 
-
 	// Lock thread list
 	SHORTLOCK( &glThreadListLock );
 	
@@ -1288,7 +1293,7 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 			}
 			// If we fall onto the same queue again, special handling is
 			// needed
-			if( Last && i == Last->Priority ) {
+			if( Last && Last->Status == THREAD_STAT_ACTIVE && i == Last->Priority ) {
 				tThread	*savedThread = thread;
 				
 				// Find the next unscheduled thread in the list
@@ -1309,6 +1314,9 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 			SHORTREL(&glThreadListLock);
 			return NULL;
 		}
+		if( thread->Status != THREAD_STAT_ACTIVE ) {
+			LogF("Oops, Thread %i (%s) is not active\n", thread->TID, thread->ThreadName);
+		}
 	}
 	#elif SCHEDULER_TYPE == SCHED_RR_SIM
 	{		
@@ -1338,6 +1346,7 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	
 	// Make the new thread non-schedulable
 	thread->CurCPU = CPU;
+	thread->Remaining = thread->Quantum;
 	
 	SHORTREL( &glThreadListLock );