X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Fthreads_int.h;h=66bb8c16379dd055646f96ef62850eef3eda0470;hb=7536e8afcc3018c4ca2a4aa8f8422cf86a6c188c;hp=ed2af53dd3cd5908d5c69cf48d46f63075589dc0;hpb=881a49e0164c582d24db527e474f587a8b5e0c32;p=tpg%2Facess2.git

diff --git a/Kernel/include/threads_int.h b/Kernel/include/threads_int.h
index ed2af53d..66bb8c16 100644
--- a/Kernel/include/threads_int.h
+++ b/Kernel/include/threads_int.h
@@ -6,6 +6,10 @@
 #define _THREADS_INT_H_
 
 #include <threads.h>
+#include <proc.h>
+
+
+typedef struct sProcess	tProcess;
 
 /**
  * \brief IPC Message
@@ -18,11 +22,28 @@ typedef struct sMessage
 	Uint8	Data[];	//!< Message data
 } tMsg;
 
+/**
+ * \brief Process state
+ */
+struct sProcess
+{
+	tPID	PID;
+	 int	nThreads;
+	
+	tUID	UID;	//!< User ID
+	tGID	GID;	//!< User and Group
+	tMemoryState	MemState;
+
+	 int	MaxFD;
+	char	*CurrentWorkingDir;
+	char	*RootDir;
+};
+
 /**
  * \brief Core threading structure
  * 
  */
-typedef struct sThread
+struct sThread
 {
 	// --- threads.c's
 	/**
@@ -37,19 +58,15 @@ typedef struct sThread
 	void	*WaitPointer;	//!< What (Mutex/Thread/other) is the thread waiting on
 	 int	RetStatus;	//!< Return Status
 	
-	Uint	TID;	//!< Thread ID
-	Uint	TGID;	//!< Thread Group (Process)
+	tTID	TID;	//!< Thread ID
+	struct sProcess	*Process;	//!< Thread Group / Process
 	struct sThread	*Parent;	//!< Parent Thread
-	Uint	UID, GID;	//!< User and Group
 	char	*ThreadName;	//!< Name of thread
 	
 	// --- arch/proc.c's responsibility
 	//! Kernel Stack Base
 	tVAddr	KernelStack;
 	
-	//! Memory Manager State
-	tMemoryState	MemState;
-	
 	//! State on task switch
 	tTaskState	SavedState;
 	
@@ -63,12 +80,15 @@ typedef struct sThread
 	 int	Quantum, Remaining;	//!< Quantum Size and remaining timesteps
 	 int	Priority;	//!< Priority - 0: Realtime, higher means less time
 	
-	Uint	Config[NUM_CFG_ENTRIES];	//!< Per-process configuration
+	 int	_errno;
 	
 	volatile int	CurCPU;
 	
-	 int	bInstrTrace;
-} tThread;
+	bool	bInstrTrace;
+	
+	// --- event.c
+	Uint32	EventState;
+};
 
 
 enum {
@@ -77,6 +97,8 @@ enum {
 	THREAD_STAT_SLEEPING,	// Message Sleep
 	THREAD_STAT_MUTEXSLEEP,	// Mutex Sleep
 	THREAD_STAT_SEMAPHORESLEEP,	// Semaphore Sleep
+	THREAD_STAT_QUEUESLEEP,	// Queue
+	THREAD_STAT_EVENTSLEEP,	// Event sleep
 	THREAD_STAT_WAITING,	// ??? (Waiting for a thread)
 	THREAD_STAT_PREINIT,	// Being created
 	THREAD_STAT_ZOMBIE,	// Died/Killed, but parent not informed
@@ -89,6 +111,8 @@ static const char * const casTHREAD_STAT[] = {
 	"THREAD_STAT_SLEEPING",
 	"THREAD_STAT_MUTEXSLEEP",
 	"THREAD_STAT_SEMAPHORESLEEP",
+	"THREAD_STAT_QUEUESLEEP",
+	"THREAD_STAT_EVENTSLEEP",
 	"THREAD_STAT_WAITING",
 	"THREAD_STAT_PREINIT",
 	"THREAD_STAT_ZOMBIE",
@@ -98,6 +122,7 @@ static const char * const casTHREAD_STAT[] = {
 
 // === GLOBALS ===
 extern BOOL	gaThreads_NoTaskSwitch[MAX_CPUS];
+extern tShortSpinlock	glThreadListLock;
 
 // === FUNCTIONS ===
 extern tThread	*Proc_GetCurThread(void);
@@ -108,9 +133,10 @@ extern int	Threads_Wake(tThread *Thread);
 extern void	Threads_Kill(tThread *Thread, int Status);
 extern void	Threads_AddActive(tThread *Thread);
 extern tThread	*Threads_RemActive(void);
+extern void	Threads_Delete(tThread *Thread);
 extern tThread	*Threads_GetNextToRun(int CPU, tThread *Last);
 
-extern tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
+extern tThread	*Threads_CloneTCB(Uint Flags);
 extern tThread	*Threads_CloneThreadZero(void);
 
 #endif