X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Fthreads.h;h=3b6e9c60441e011fd3409a5e1e89cbda9fa2ec9e;hb=de2ae10743172075f2d527780bdfd890ccddb8e7;hp=2b066d9f338f917fdd2d4fdc813ea4bcbe9ad216;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Kernel/include/threads.h b/Kernel/include/threads.h
index 2b066d9f..3b6e9c60 100644
--- a/Kernel/include/threads.h
+++ b/Kernel/include/threads.h
@@ -5,6 +5,7 @@
 
 #include <arch.h>
 #include <signal.h>
+#include <proc.h>
 
 typedef struct sMessage
 {
@@ -17,34 +18,34 @@ typedef struct sMessage
 typedef struct sThread
 {
 	// --- threads.c's
-	//  0
-	struct sThread	*Next;	//!< Next thread in list
-	tSpinlock	IsLocked;	//!< Thread's spinlock
+	/**
+	 * \brief Next thread in current list
+	 * \note Required to be first for linked list hacks to work
+	 */
+	struct sThread	*Next;
+	struct sThread	*GlobalNext;	//!< Next thread in global list
+	struct sThread	*GlobalPrev;	//!< Previous thread in global list
+	tShortSpinlock	IsLocked;	//!< Thread's spinlock
 	volatile int	Status;		//!< Thread Status
 	 int	RetStatus;	//!< Return Status
 	
-	// 16
 	Uint	TID;	//!< Thread ID
 	Uint	TGID;	//!< Thread Group (Process)
-	Uint	PTID;	//!< Parent Thread ID
+	struct sThread	*Parent;	//!< Parent Thread
 	Uint	UID, GID;	//!< User and Group
 	char	*ThreadName;	//!< Name of thread
 	
 	// --- arch/proc.c's responsibility
-	// 40
 	//! Kernel Stack Base
 	tVAddr	KernelStack;
 	
-	// 44 (x86)
 	//! Memory Manager State
 	tMemoryState	MemState;
 	
-	// 48 (x86)
 	//! State on task switch
 	tTaskState	SavedState;
 	
 	// --- threads.c's
-	// 60
 	 int	CurFaultNum;	//!< Current fault number, 0: none
 	tVAddr	FaultHandler;	//!< Fault Handler
 	
@@ -55,16 +56,19 @@ typedef struct sThread
 	 int	NumTickets;	//!< Priority - Chance of gaining CPU
 	
 	Uint	Config[NUM_CFG_ENTRIES];	//!< Per-process configuration
+	
+	volatile int	CurCPU;
 } tThread;
 
 
 enum {
-	THREAD_STAT_NULL,
-	THREAD_STAT_ACTIVE,
-	THREAD_STAT_SLEEPING,
-	THREAD_STAT_WAITING,
-	THREAD_STAT_ZOMBIE,
-	THREAD_STAT_DEAD
+	THREAD_STAT_NULL,	// Invalid process
+	THREAD_STAT_ACTIVE,	// Running and schedulable process
+	THREAD_STAT_SLEEPING,	// Message Sleep
+	THREAD_STAT_OFFSLEEP,	// Mutex Sleep (or waiting on a thread)
+	THREAD_STAT_WAITING,	// ???
+	THREAD_STAT_ZOMBIE,	// Died, just not removed
+	THREAD_STAT_DEAD	// Why do we care about these???
 };
 
 enum eFaultNumbers
@@ -77,10 +81,14 @@ enum eFaultNumbers
 	FAULT_FLOAT
 };
 
+#define GETMSG_IGNORE	((void*)-1)
+
 // === FUNCTIONS ===
-extern tThread	*Proc_GetCurThread();
+extern tThread	*Proc_GetCurThread(void);
 extern tThread	*Threads_GetThread(Uint TID);
-extern void	Threads_Wake(tThread *Thread);
+extern void	Threads_SetTickets(tThread *Thread, int Num);
+extern int	Threads_Wake(tThread *Thread);
 extern void	Threads_AddActive(tThread *Thread);
+extern tThread	*Threads_GetNextToRun(int CPU, tThread *Last);
 
 #endif