X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Fthreads.c;h=4dcdb9461981a6dac8f49bfe85e4ce44a0fd8139;hb=f99f0ec855b82620c45b4c539ef7d3832680db0d;hp=50889bffcefe2b8eeb7a0a52248e82533e3ed153;hpb=a508bd147b638786d1f45869d41cfeb57f3fbedb;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/threads.c b/KernelLand/Kernel/threads.c
index 50889bff..4dcdb946 100644
--- a/KernelLand/Kernel/threads.c
+++ b/KernelLand/Kernel/threads.c
@@ -10,6 +10,7 @@
 #include <errno.h>
 #include <hal_proc.h>
 #include <semaphore.h>
+#include <rwlock.h>
 #include <vfs_threads.h>	// VFS Handle maintainence
 #include <events.h>
 
@@ -49,7 +50,7 @@ void	Threads_Delete(tThread *Thread);
 char	*Threads_GetName(tTID ID);
 #if 0
 void	Threads_SetPriority(tThread *Thread, int Pri);
-tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
+tThread	*Threads_CloneTCB(Uint Flags);
  int	Threads_WaitTID(int TID, int *status);
 tThread	*Threads_GetThread(Uint TID);
 #endif
@@ -59,9 +60,7 @@ void	Threads_int_AddToList(tThreadList *List, tThread *Thread);
 void	Threads_Exit(int TID, int Status);
 void	Threads_Kill(tThread *Thread, int Status);
 void	Threads_Yield(void);
-#endif
-void	Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock);
-#if 0
+ int	Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock);
 void	Threads_Sleep(void);
  int	Threads_Wake(tThread *Thread);
 void	Threads_AddActive(tThread *Thread);
@@ -507,6 +506,7 @@ tTID Threads_WaitTID(int TID, int *Status)
 	// Specific Thread
 	if(TID > 0)
 	{
+		// TODO: Register on thread to be poked when it dies
 		tTID	ret;
 		// NOTE: Race condition - Other child dies, desired child dies, first death is 'lost'
 		while( (ret = Threads_WaitTID(-1, Status)) != TID )
@@ -754,7 +754,7 @@ void Threads_int_WaitForStatusEnd(enum eThreadStatus Status)
 	}
 }
 
-void Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock)
+int Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock)
 {
 	SHORTLOCK( &glThreadListLock );
 	tThread	*us = Threads_RemActive();
@@ -768,12 +768,11 @@ void Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **
 	if( ListTail ) {
 		if(*ListTail) {
 			(*ListTail)->Next = us;
-			*ListTail = us;
 		}
 		else {
 			*ListHead = us;
-			*ListTail = us;
 		}
+		*ListTail = us;
 	}
 	else {
 		*ListHead = us;
@@ -783,8 +782,10 @@ void Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **
 	//	return ;
 	SHORTREL( &glThreadListLock );
 	if( Lock )
-		SHORTLOCK( Lock );
+		SHORTREL( Lock );
 	Threads_int_WaitForStatusEnd(Status);
+	us->WaitPointer = NULL;
+	return us->RetStatus;
 }
 
 /**
@@ -1116,22 +1117,41 @@ void Threads_SetSignalHandler(int SignalNum, void *Handler)
 }
 
 /**
- * \return 0  Ignore
+ * \brief Gets the registered (or default, if none set) handler for a signal.
+ * \return Handler function pointer, OR NULL if no signal to be ignored
  */
 void *Threads_GetSignalHandler(int SignalNum)
 {
+	// TODO: Core dump
+	void *User_Signal_Core = User_Signal_Kill;
+	
 	if( SignalNum <= 0 || SignalNum >= NSIGNALS )
 		return NULL;
 	void *ret = Proc_GetCurThread()->Process->SignalHandlers[SignalNum];
-	if( !ret )
+	if( !ret || (SignalNum == SIGKILL || SignalNum == SIGSTOP) )
 	{
 		// Defaults
 		switch(SignalNum)
 		{
+		case SIGHUP:
 		case SIGINT:
+			ret = User_Signal_Kill;
+			break;
+		case SIGQUIT:
+		case SIGILL:
+		case SIGABRT:
+		case SIGFPE:
+			ret = User_Signal_Core;
+			break;
 		case SIGKILL:
+			ret = User_Signal_Kill;
+			break;
 		case SIGSEGV:
-		case SIGHUP:
+			ret = User_Signal_Core;
+			break;
+		case SIGPIPE:
+		case SIGALRM:
+		case SIGTERM:
 			ret = User_Signal_Kill;
 			break;
 		default:
@@ -1232,6 +1252,11 @@ void Threads_int_DumpThread(tThread *thread)
 	case THREAD_STAT_MUTEXSLEEP:
 		Log("  Mutex Pointer: %p", thread->WaitPointer);
 		break;
+	case THREAD_STAT_RWLOCKSLEEP:
+		Log("  Lock Pointer: %p", thread->WaitPointer);
+		Log("  Lock Name: %s",
+			((tRWLock*)thread->WaitPointer)->Name);
+		break;
 	case THREAD_STAT_SEMAPHORESLEEP:
 		Log("  Semaphore Pointer: %p", thread->WaitPointer);
 		Log("  Semaphore Name: %s:%s", 
@@ -1240,7 +1265,7 @@ void Threads_int_DumpThread(tThread *thread)
 			);
 		break;
 	case THREAD_STAT_EVENTSLEEP:
-		// TODO: Event mask
+		Log("  Event Mask: %x", thread->RetStatus);
 		break;
 	case THREAD_STAT_ZOMBIE:
 		Log("  Return Status: %i", thread->RetStatus);