X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=a81736b19bcfdee96eb17a8ce1b9fcec9f7010e4;hb=5985944028ce18d8abf3bcf5208545a506526f0f;hp=c0c613297a309f88fa123273f65e9bfc188f4f7d;hpb=17aac974ab83a3521f2b49b8de33ae05a00fbe07;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index c0c61329..a81736b1 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -667,9 +667,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 +679,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 +715,9 @@ void Threads_Sleep(void)
 	
 	// Release Spinlock
 	SHORTREL( &glThreadListLock );
-	
-	while(cur->Status != THREAD_STAT_ACTIVE)	HALT();
+
+	while(cur->Status != THREAD_STAT_ACTIVE)
+		Proc_Reschedule();
 }
 
 
@@ -905,14 +904,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
@@ -939,8 +941,6 @@ tThread *Threads_RemActive(void)
 		GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
 	#endif
 	
-	SHORTREL( &glThreadListLock );
-	
 	return ret;
 }
 
@@ -1141,7 +1141,6 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	if( gaThreads_NoTaskSwitch[CPU] )
 		return Last;
 
-
 	// Lock thread list
 	SHORTLOCK( &glThreadListLock );
 	
@@ -1314,6 +1313,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
 	{		
@@ -1343,6 +1345,7 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	
 	// Make the new thread non-schedulable
 	thread->CurCPU = CPU;
+	thread->Remaining = thread->Quantum;
 	
 	SHORTREL( &glThreadListLock );