X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=a81736b19bcfdee96eb17a8ce1b9fcec9f7010e4;hb=c43c05ef3234d6118ce601d299df60383d54ac7b;hp=3ebc4dc6aa3428820b4f1d6e488520608e8d46f8;hpb=f79073d5ab322eef0813f7b05af0d31174d2c9d6;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 3ebc4dc6..a81736b1 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -7,7 +7,9 @@
 #include <threads.h>
 #include <threads_int.h>
 #include <errno.h>
+#include <mutex.h>
 #include <semaphore.h>
+#include <hal_proc.h>
 
 // Configuration
 #define DEBUG_TRACE_TICKETS	0	// Trace ticket counts
@@ -20,10 +22,10 @@
 #define SCHED_RR_SIM	2	// Single Queue Round Robin
 #define SCHED_RR_PRI	3	// Multi Queue Round Robin
 // Set scheduler type
-#define SCHEDULER_TYPE	SCHED_LOTTERY
+#define SCHEDULER_TYPE	SCHED_RR_PRI
 
 // === CONSTANTS ===
-#define	DEFAULT_QUANTUM	10
+#define	DEFAULT_QUANTUM	5
 #define	DEFAULT_PRIORITY	5
 #define MIN_PRIORITY		10
 const enum eConfigTypes	cCONFIG_TYPES[] = {
@@ -33,10 +35,6 @@ const enum eConfigTypes	cCONFIG_TYPES[] = {
 };
 
 // === IMPORTS ===
-extern void	ArchThreads_Init(void);
-extern void	Proc_CallFaultHandler(tThread *Thread);
-extern void	Proc_DumpThreadCPUState(tThread *Thread);
-extern int	GetCPUNum(void);
 
 // === PROTOTYPES ===
 void	Threads_Init(void);
@@ -669,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();
 	}
 }
 
@@ -680,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();
 }
 
 /**
@@ -719,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();
 }
 
 
@@ -851,7 +848,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 ;
@@ -861,13 +859,23 @@ void Threads_AddActive(tThread *Thread)
 	Thread->Status = THREAD_STAT_ACTIVE;
 //	Thread->CurCPU = -1;
 	// Add to active list
-	#if SCHEDULER_TYPE == SCHED_RR_PRI
-	Thread->Next = gaActiveThreads[Thread->Priority];
-	gaActiveThreads[Thread->Priority] = Thread;
-	#else
-	Thread->Next = gActiveThreads;
-	gActiveThreads = Thread;
-	#endif
+	{
+		tThread	*tmp, *prev = NULL;
+		#if SCHEDULER_TYPE == SCHED_RR_PRI
+		for( tmp = gaActiveThreads[Thread->Priority]; tmp; prev = tmp, tmp = tmp->Next );
+		if(prev)
+			prev->Next = Thread;
+		else
+			gaActiveThreads[Thread->Priority] = Thread;
+		#else
+		for( tmp = gActiveThreads; tmp; prev = tmp, tmp = tmp->Next );
+		if(prev)
+			prev->Next = Thread;
+		else
+			gActiveThreads = Thread;
+		#endif
+		Thread->Next = NULL;
+	}
 	
 	// Update bookkeeping
 	giNumActiveThreads ++;
@@ -896,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
@@ -930,8 +941,6 @@ tThread *Threads_RemActive(void)
 		GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets);
 	#endif
 	
-	SHORTREL( &glThreadListLock );
-	
 	return ret;
 }
 
@@ -971,6 +980,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();
 	}
@@ -986,7 +996,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, KERNEL_BASE);
 	Threads_Fault( 1 );
 	//Threads_Exit( 0, -1 );
 }
@@ -1128,7 +1141,6 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 	if( gaThreads_NoTaskSwitch[CPU] )
 		return Last;
 
-
 	// Lock thread list
 	SHORTLOCK( &glThreadListLock );
 	
@@ -1280,7 +1292,7 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last)
 			}
 			// If we fall onto the same queue again, special handling is
 			// needed
-			if( i == Last->Priority ) {
+			if( Last && i == Last->Priority ) {
 				tThread	*savedThread = thread;
 				
 				// Find the next unscheduled thread in the list
@@ -1301,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
 	{		
@@ -1330,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 );
 	
@@ -1474,7 +1490,6 @@ int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
 		else
 			taken = Sem->Value;
 		Sem->Value -= taken;
-		SHORTREL( &Sem->Protector );
 	}
 	else
 	{