X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=54438c32a79db339f7df6db0f9b19e08f24f4752;hb=eb80b37c619769496f3fca58d54c4a4b8d8fac4a;hp=9b8b30f9affc875d1abce70c3810c6dc5c2724ae;hpb=a221c4590eeaf8fb4dc4fc9cb97177f8752d60e5;p=tpg%2Facess2.git

diff --git a/Kernel/threads.c b/Kernel/threads.c
index 9b8b30f9..54438c32 100644
--- a/Kernel/threads.c
+++ b/Kernel/threads.c
@@ -20,6 +20,7 @@ extern int	Proc_Clone(Uint *Err, Uint Flags);
 // === PROTOTYPES ===
 void	Threads_Init();
 void	Threads_SetName(char *NewName);
+char	*Threads_GetName(int ID);
 void	Threads_SetTickets(int Num);
  int	Threads_WaitTID(int TID, int *status);
 tThread	*Threads_GetThread(Uint TID);
@@ -30,6 +31,7 @@ void	Threads_Kill(tThread *Thread, int Status);
 void	Threads_Yield();
 void	Threads_Sleep();
 void	Threads_Wake(tThread *Thread);
+void	Threads_AddActive(tThread *Thread);
  int	Threads_GetPID();
  int	Threads_GetTID();
  int	Threads_GetUID();
@@ -93,7 +95,10 @@ void Threads_Init()
 		cur->ThreadName = "Idle Thread";
 		Threads_SetTickets(0);	// Never called randomly
 		cur->Quantum = 1;	// 1 slice quantum
-		for(;;)	__asm__ __volatile__ ("hlt");	// Just yeilds
+		HALT();
+		for(;;) {
+			HALT();	// Just yeilds
+		}
 	}
 	#endif
 	
@@ -113,6 +118,18 @@ void Threads_SetName(char *NewName)
 	strcpy(cur->ThreadName, NewName);
 }
 
+/**
+ * \fn char *Threads_GetName(int ID)
+ * \brief Gets a thread's name
+ */
+char *Threads_GetName(int ID)
+{
+	if(ID == -1) {
+		return Proc_GetCurThread()->ThreadName;
+	}
+	return NULL;
+}
+
 /**
  * \fn void Threads_SetTickets(int Num)
  * \brief Sets the 'priority' of a task
@@ -136,9 +153,7 @@ void Threads_SetTickets(int Num)
  * \brief Wait for a task to change state
  */
 int Threads_WaitTID(int TID, int *status)
-{
-	Threads_Dump();
-	
+{	
 	// Any Child
 	if(TID == -1) {
 		
@@ -254,7 +269,10 @@ tThread *Threads_int_GetPrev(tThread **List, tThread *Thread)
  */
 void Threads_Exit(int TID, int Status)
 {
-	Threads_Kill( Proc_GetCurThread(), (Uint)Status & 0xFF );
+	if( TID == 0 )
+		Threads_Kill( Proc_GetCurThread(), (Uint)Status & 0xFF );
+	else
+		Threads_Kill( Threads_GetThread(TID), (Uint)Status & 0xFF );
 }
 
 /**
@@ -275,7 +293,7 @@ void Threads_Kill(tThread *Thread, int Status)
 			child;
 			child = child->Next)
 		{
-			if(child->PTID == gCurrentThread->TID)
+			if(child->PTID == Thread->TID)
 				Threads_Kill(child, -1);
 		}
 	}
@@ -335,7 +353,7 @@ void Threads_Kill(tThread *Thread, int Status)
  */
 void Threads_Yield()
 {
-	Proc_GetCurThread()->Quantum = 0;
+	Proc_GetCurThread()->Remaining = 0;
 	HALT();
 }
 
@@ -348,7 +366,7 @@ void Threads_Sleep()
 	tThread *cur = Proc_GetCurThread();
 	tThread *thread;
 	
-	//Log("Proc_Sleep: %i going to sleep", gCurrentThread->TID);
+	Log("Proc_Sleep: %i going to sleep", cur->TID);
 	
 	// Acquire Spinlock
 	LOCK( &giThreadListLock );
@@ -421,6 +439,22 @@ void Threads_Wake(tThread *Thread)
 	}
 }
 
+/**
+ * \fn void Threads_AddActive(tThread *Thread)
+ * \brief Adds a thread to the active queue
+ */
+void Threads_AddActive(tThread *Thread)
+{
+	LOCK( &giThreadListLock );
+	Thread->Next = gActiveThreads;
+	gActiveThreads = Thread;
+	giNumActiveThreads ++;
+	giTotalTickets += Thread->NumTickets;
+	//Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i",
+	//	giNumActiveThreads, giTotalTickets);
+	RELEASE( &giThreadListLock );
+}
+
 #if 0
 /**
  * \fn void Threads_SetSignalHandler(int Num, void *Handler)
@@ -435,6 +469,7 @@ void Threads_SetSignalHandler(int Num, void *Handler)
 
 /**
  * \fn void Threads_SendSignal(int TID, int Num)
+ * \brief Send a signal to a thread
  */
 void Threads_SendSignal(int TID, int Num)
 {
@@ -530,9 +565,13 @@ tThread *Threads_GetNextToRun(int CPU)
 		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)
 	{
@@ -552,3 +591,14 @@ tThread *Threads_GetNextToRun(int CPU)
 	
 	return thread;
 }
+
+/**
+ * \fn void Threads_SegFault(tVAddr Addr)
+ * \brief Called when a Segment Fault occurs
+ */
+void Threads_SegFault(tVAddr Addr)
+{
+	//Threads_SendSignal( Proc_GetCurThread()->TID, SIGSEGV );
+	Log("Thread #%i committed a segfault at address %p\n", Proc_GetCurThread()->TID, Addr);
+	Threads_Exit( 0, 0 );
+}