X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Finclude%2Fthreads_int.h;h=1c9a08d79342b1f0c964660fa1308b0fb2beb46e;hb=bdab8e5cebaf249d291d19523d0358f8c1c98008;hp=642f6c32237985a19798968d2e9f96dd97906cdb;hpb=2db551c69841b4fb5a70ae05e08d54b1a016364b;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/include/threads_int.h b/KernelLand/Kernel/include/threads_int.h
index 642f6c32..1c9a08d7 100644
--- a/KernelLand/Kernel/include/threads_int.h
+++ b/KernelLand/Kernel/include/threads_int.h
@@ -12,6 +12,7 @@
 #include <threads.h>
 #include <proc.h>
 #include <timers_int.h>
+#include <posix_signals.h>
 
 typedef struct sProcess	tProcess;
 
@@ -32,6 +33,7 @@ typedef struct sMessage
 struct sProcess
 {
 	struct sProcess	*Next;
+	struct sProcess	*Prev;
 	tPGID	PGID;
 	tPID	PID;
 
@@ -45,6 +47,8 @@ struct sProcess
 	 int	MaxFD;
 	char	*CurrentWorkingDir;
 	char	*RootDir;
+	
+	void	*SignalHandlers[NSIGNALS];
 };
 
 /**
@@ -86,6 +90,10 @@ struct sThread
 	 int	CurFaultNum;	//!< Current fault number, 0: none
 	tVAddr	FaultHandler;	//!< Fault Handler
 	
+	
+	 int	PendingSignal;	//!< Pending signal ID (0 = none)
+	
+	
 	tMsg * volatile	Messages;	//!< Message Queue
 	tMsg	*LastMessage;	//!< Last Message (speeds up insertion)
 	
@@ -125,6 +133,7 @@ static const char * const casTHREAD_STAT[] = {
 	"THREAD_STAT_ACTIVE",
 	"THREAD_STAT_SLEEPING",
 	"THREAD_STAT_MUTEXSLEEP",
+	"THREAD_STAT_RWLOCKSLEEP",
 	"THREAD_STAT_SEMAPHORESLEEP",
 	"THREAD_STAT_QUEUESLEEP",
 	"THREAD_STAT_EVENTSLEEP",
@@ -134,6 +143,7 @@ static const char * const casTHREAD_STAT[] = {
 	"THREAD_STAT_DEAD",
 	"THREAD_STAT_BURIED"
 };
+static const unsigned int ciTHREAD_STAT_COUNT = sizeof(casTHREAD_STAT)/sizeof(casTHREAD_STAT[0]);
 
 // === GLOBALS ===
 extern BOOL	gaThreads_NoTaskSwitch[MAX_CPUS];
@@ -152,6 +162,8 @@ extern tThread	*Threads_GetNextToRun(int CPU, tThread *Last);
 extern tThread	*Threads_CloneTCB(Uint Flags);
 extern tThread	*Threads_CloneThreadZero(void);
 
+extern int	Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock);
+extern void	Threads_int_WaitForStatusEnd(enum eThreadStatus Status);
 extern void	Semaphore_ForceWake(tThread *Thread);
 
 #endif