X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=8c51d9a6e99d2f694308cbee1b9e23d157c5c7d6;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=0a9ab372443e90ce7e24ed7fe45cd4478b31dd66;hpb=85eb17b306404571aa39596946c87ad9bb1d9d13;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 0a9ab372..8c51d9a6 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -72,7 +72,7 @@ tThread	gThreadZero = {
 	};
 // -- Processes --
 // --- Locks ---
-volatile int	giThreadListLock = 0;	///\note NEVER use a heap function while locked
+tSpinlock	glThreadListLock = 0;	///\note NEVER use a heap function while locked
 // --- Current State ---
 volatile int	giNumActiveThreads = 0;
 volatile int	giTotalTickets = 0;
@@ -151,12 +151,12 @@ void Threads_SetTickets(int Num)
 	if(Num < 0)	return;
 	if(Num > MAX_TICKETS)	Num = MAX_TICKETS;
 	
-	LOCK( &giThreadListLock );
+	LOCK( &glThreadListLock );
 	giTotalTickets -= cur->NumTickets;
 	cur->NumTickets = Num;
 	giTotalTickets += Num;
 	//LOG("giTotalTickets = %i", giTotalTickets);
-	RELEASE( &giThreadListLock );
+	RELEASE( &glThreadListLock );
 }
 
 /**
@@ -402,7 +402,7 @@ void Threads_Kill(tThread *Thread, int Status)
 	LOCK( &Thread->IsLocked );
 	
 	// Lock thread list
-	LOCK( &giThreadListLock );
+	LOCK( &glThreadListLock );
 	
 	// Get previous thread on list
 	prev = Threads_int_GetPrev( &gActiveThreads, Thread );
@@ -440,7 +440,7 @@ void Threads_Kill(tThread *Thread, int Status)
 	
 	// Release spinlocks
 	RELEASE( &Thread->IsLocked );	// Released first so that it IS released
-	RELEASE( &giThreadListLock );
+	RELEASE( &glThreadListLock );
 	
 	//Log("Thread %i went *hurk*", Thread->TID);
 	
@@ -469,7 +469,7 @@ void Threads_Sleep()
 	//Log_Log("Threads", "%i going to sleep", cur->TID);
 	
 	// Acquire Spinlock
-	LOCK( &giThreadListLock );
+	LOCK( &glThreadListLock );
 	
 	// Get thread before current thread
 	thread = Threads_int_GetPrev( &gActiveThreads, cur );
@@ -481,7 +481,7 @@ void Threads_Sleep()
 	
 	// Don't sleep if there is a message waiting
 	if( cur->Messages ) {
-		RELEASE( &giThreadListLock );
+		RELEASE( &glThreadListLock );
 		return;
 	}
 	
@@ -503,7 +503,7 @@ void Threads_Sleep()
 	cur->Status = THREAD_STAT_SLEEPING;
 	
 	// Release Spinlock
-	RELEASE( &giThreadListLock );
+	RELEASE( &glThreadListLock );
 	
 	while(cur->Status != THREAD_STAT_ACTIVE)	HALT();
 }
@@ -521,7 +521,7 @@ void Threads_Wake(tThread *Thread)
 	case THREAD_STAT_ACTIVE:	break;
 	case THREAD_STAT_SLEEPING:
 		//Log_Log("Threads", "Waking %i (%p) from sleeping", Thread->TID, Thread);
-		LOCK( &giThreadListLock );
+		LOCK( &glThreadListLock );
 		prev = Threads_int_GetPrev(&gSleepingThreads, Thread);
 		prev->Next = Thread->Next;	// Remove from sleeping queue
 		Thread->Next = gActiveThreads;	// Add to active queue
@@ -529,7 +529,7 @@ void Threads_Wake(tThread *Thread)
 		giNumActiveThreads ++;
 		giTotalTickets += Thread->NumTickets;
 		Thread->Status = THREAD_STAT_ACTIVE;
-		RELEASE( &giThreadListLock );
+		RELEASE( &glThreadListLock );
 		break;
 	case THREAD_STAT_WAITING:
 		Warning("Thread_Wake - Waiting threads are not currently supported");
@@ -554,18 +554,18 @@ void Threads_WakeTID(tTID Thread)
  */
 void Threads_AddActive(tThread *Thread)
 {
-	LOCK( &giThreadListLock );
+	LOCK( &glThreadListLock );
 	Thread->Next = gActiveThreads;
 	gActiveThreads = Thread;
 	giNumActiveThreads ++;
 	giTotalTickets += Thread->NumTickets;
 	//Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i",
 	//	giNumActiveThreads, giTotalTickets);
-	RELEASE( &giThreadListLock );
+	RELEASE( &glThreadListLock );
 }
 
 /**
- * \fn void Threads_SetSignalHandler(Uint Handler)
+ * \fn void Threads_SetFaultHandler(Uint Handler)
  * \brief Sets the signal handler for a signal
  */
 void Threads_SetFaultHandler(Uint Handler)
@@ -606,6 +606,8 @@ void Threads_Fault(int Num)
 		HALT();
 	}
 	
+	thread->CurFaultNum = Num;
+	
 	Proc_CallFaultHandler(thread);
 }
 
@@ -691,24 +693,17 @@ tThread *Threads_GetNextToRun(int CPU)
 	 int	number;
 	
 	if(giNumActiveThreads == 0) {
-		//Log_Debug("Threads", "CPU%i has no threads to run", CPU);
 		return NULL;
 	}
 	
 	// Special case: 1 thread
 	if(giNumActiveThreads == 1) {
-		//Log_Debug("Threads", "CPU%i has only one thread %i %s",
-		//	CPU, gActiveThreads->TID, gActiveThreads->ThreadName);
 		return gActiveThreads;
 	}
 	
-	//Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i",
-	//	giNumActiveThreads, giTotalTickets);
 	// Get the ticket number
 	ticket = number = rand() % giTotalTickets;
 	
-	//Log(" Threads_GetNextToRun: ticket = %i", ticket);
-	
 	// Find the next thread
 	for(thread=gActiveThreads;thread;thread=thread->Next)
 	{
@@ -726,9 +721,6 @@ tThread *Threads_GetNextToRun(int CPU)
 			giTotalTickets, number);
 	}
 	
-	//Log_Debug("Threads", "Switching CPU%i to %p (%s)",
-	//	CPU, thread, thread->ThreadName);
-	
 	return thread;
 }