X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Fproc.c;h=f7bda0fca98725835316947867fe951e8937c1a9;hb=9d3800f60f2212432e550a4e003ae65b498a4d36;hp=48a3c1a054fb78350e332e905517c532d004d300;hpb=b574da4b635c3c030757e0877e7a947c5b4a4871;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/proc.c b/Kernel/arch/x86/proc.c
index 48a3c1a0..f7bda0fc 100644
--- a/Kernel/arch/x86/proc.c
+++ b/Kernel/arch/x86/proc.c
@@ -10,6 +10,9 @@
 # include <mp.h>
 #endif
 
+// === FLAGS ===
+#define DEBUG_TRACE_SWITCH	0
+
 // === CONSTANTS ===
 #define	SWITCH_MAGIC	0xFFFACE55	// There is no code in this area
 #define TIMER_DIVISOR	11931	//~100Hz
@@ -29,6 +32,8 @@ extern tThread	*gActiveThreads;
 extern tThread	*gSleepingThreads;
 extern tThread	*gDeleteThreads;
 extern tThread	*Threads_GetNextToRun(int CPU);
+extern void	Threads_Dump();
+extern tThread	*Threads_CloneTCB(Uint *Err, Uint Flags);
 
 // === PROTOTYPES ===
 void	ArchThreads_Init();
@@ -40,7 +45,7 @@ void	Proc_Scheduler();
 // === GLOBALS ===
 // --- Current State ---
 #if USE_MP
-tThread	*gCurrentThread[MAX_CPUS] = NULL;
+tThread	*gCurrentThread[MAX_CPUS] = {NULL};
 #else
 tThread	*gCurrentThread = NULL;
 #endif
@@ -131,6 +136,14 @@ void ArchThreads_Init()
 	gCurrentThread = &gThreadZero;
 	#endif
 	
+	#if USE_PAE
+	gThreadZero.MemState.PDP[0] = 0;
+	gThreadZero.MemState.PDP[1] = 0;
+	gThreadZero.MemState.PDP[2] = 0;
+	#else
+	gThreadZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE;
+	#endif
+	
 	// Set timer frequency
 	outb(0x43, 0x34);	// Set Channel 0, Low/High, Rate Generator
 	outb(0x40, TIMER_DIVISOR&0xFF);	// Low Byte of Divisor
@@ -141,7 +154,14 @@ void ArchThreads_Init()
 	
 	// Change Stacks
 	Proc_ChangeStack();
-	
+}
+
+/**
+ * \fn void Proc_Start()
+ * \brief Start process scheduler
+ */
+void Proc_Start()
+{
 	// Start Interrupts (and hence scheduler)
 	__asm__ __volatile__("sti");
 }
@@ -217,27 +237,25 @@ void Proc_ChangeStack()
 int Proc_Clone(Uint *Err, Uint Flags)
 {
 	tThread	*newThread;
+	tThread	*cur = Proc_GetCurThread();
 	Uint	eip, esp, ebp;
 	
 	__asm__ __volatile__ ("mov %%esp, %0": "=r"(esp));
 	__asm__ __volatile__ ("mov %%ebp, %0": "=r"(ebp));
 	
-	// Create new thread structure
-	newThread = malloc( sizeof(tThread) );
-	if(!newThread) {
-		Warning("Proc_Clone - Out of memory when creating thread\n");
-		*Err = -ENOMEM;
-		return -1;
-	}
-	// Base new thread on old
-	memcpy(newThread, gCurrentThread, sizeof(tThread));
+	newThread = Threads_CloneTCB(Err, Flags);
+	if(!newThread)	return -1;
+	
 	// Initialise Memory Space (New Addr space or kernel stack)
 	if(Flags & CLONE_VM) {
-		newThread->TGID = newThread->TID;
 		newThread->MemState.CR3 = MM_Clone();
+		newThread->KernelStack = cur->KernelStack;
 	} else {
 		Uint	tmpEbp, oldEsp = esp;
 
+		// Set CR3
+		newThread->MemState.CR3 = cur->MemState.CR3;
+
 		// Create new KStack
 		newThread->KernelStack = MM_NewKStack();
 		// Check for errors
@@ -247,35 +265,22 @@ int Proc_Clone(Uint *Err, Uint Flags)
 		}
 
 		// Get ESP as a used size
-		esp = gCurrentThread->KernelStack - esp;
+		esp = cur->KernelStack - esp;
 		// Copy used stack
-		memcpy( (void*)(newThread->KernelStack - esp), (void*)(gCurrentThread->KernelStack - esp), esp );
+		memcpy( (void*)(newThread->KernelStack - esp), (void*)(cur->KernelStack - esp), esp );
 		// Get ESP as an offset in the new stack
 		esp = newThread->KernelStack - esp;
 		// Adjust EBP
-		ebp = newThread->KernelStack - (gCurrentThread->KernelStack - ebp);
+		ebp = newThread->KernelStack - (cur->KernelStack - ebp);
 
 		// Repair EBPs & Stack Addresses
 		// Catches arguments also, but may trash stack-address-like values
 		for(tmpEbp = esp; tmpEbp < newThread->KernelStack; tmpEbp += 4)
 		{
-			if(oldEsp < *(Uint*)tmpEbp && *(Uint*)tmpEbp < gCurrentThread->KernelStack)
-				*(Uint*)tmpEbp += newThread->KernelStack - gCurrentThread->KernelStack;
+			if(oldEsp < *(Uint*)tmpEbp && *(Uint*)tmpEbp < cur->KernelStack)
+				*(Uint*)tmpEbp += newThread->KernelStack - cur->KernelStack;
 		}
 	}
-
-	// Set Pointer, Spinlock and TID
-	newThread->Next = NULL;
-	newThread->IsLocked = 0;
-	newThread->TID = giNextTID++;
-	newThread->PTID = gCurrentThread->TID;
-
-	// Clear message list (messages are not inherited)
-	newThread->Messages = NULL;
-	newThread->LastMessage = NULL;
-	
-	// Set remaining (sheduler expects remaining to be correct)
-	newThread->Remaining = newThread->Quantum;
 	
 	// Save core machine state
 	newThread->SavedState.ESP = esp;
@@ -290,12 +295,7 @@ int Proc_Clone(Uint *Err, Uint Flags)
 	newThread->SavedState.EIP = eip;
 	
 	// Lock list and add to active
-	LOCK( &giThreadListLock );
-	newThread->Next = gActiveThreads;
-	gActiveThreads = newThread;
-	giNumActiveThreads ++;
-	giTotalTickets += newThread->NumTickets;
-	RELEASE( &giThreadListLock );
+	Threads_AddActive(newThread);
 	
 	return newThread->TID;
 }
@@ -449,7 +449,7 @@ void Proc_Scheduler(int CPU)
 	
 	// Check if there is any tasks running
 	if(giNumActiveThreads == 0) {
-		Log("No Active threads, sleeping\n");
+		Log("No Active threads, sleeping");
 		__asm__ __volatile__ ("hlt");
 		return;
 	}
@@ -479,6 +479,14 @@ void Proc_Scheduler(int CPU)
 		return;
 	}
 	
+	#if DEBUG_TRACE_SWITCH
+	Log("Switching to task %i, CR3 = 0x%x, EIP = %p",
+		thread->TID,
+		thread->MemState.CR3,
+		thread->SavedState.EIP
+		);
+	#endif
+	
 	// Set current thread
 	gCurrentThread = thread;