# 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
extern int giNextTID;
extern int giTotalTickets;
extern int giNumActiveThreads;
+extern tThread gThreadZero;
extern tThread *gActiveThreads;
extern tThread *gSleepingThreads;
extern tThread *gDeleteThreads;
extern tThread *Threads_GetNextToRun(int CPU);
+extern void Threads_Dump();
// === PROTOTYPES ===
void ArchThreads_Init();
// === GLOBALS ===
// --- Current State ---
#if USE_MP
-tThread **gCurrentThread = NULL;
+tThread *gCurrentThread[MAX_CPUS] = {NULL};
#else
tThread *gCurrentThread = NULL;
#endif
}
#endif
+ #if USE_MP
+ gCurrentThread[0] = &gThreadZero;
+ #else
+ 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
// Change Stacks
Proc_ChangeStack();
-
+}
+
+/**
+ * \fn void Proc_Start()
+ * \brief Start process scheduler
+ */
+void Proc_Start()
+{
// Start Interrupts (and hence scheduler)
__asm__ __volatile__("sti");
}
int Proc_Clone(Uint *Err, Uint Flags)
{
tThread *newThread;
+ tThread *cur = Proc_GetCurThread();
Uint eip, esp, ebp;
__asm__ __volatile__ ("mov %%esp, %0": "=r"(esp));
*Err = -ENOMEM;
return -1;
}
- // Base new thread on old
- memcpy(newThread, gCurrentThread, sizeof(tThread));
+
+ // Base new thread on current
+ memcpy(newThread, cur, sizeof(tThread));
+
// Initialise Memory Space (New Addr space or kernel stack)
if(Flags & CLONE_VM) {
newThread->TGID = newThread->TID;
}
// 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;
}
}
newThread->Next = NULL;
newThread->IsLocked = 0;
newThread->TID = giNextTID++;
- newThread->PTID = gCurrentThread->TID;
+ newThread->PTID = cur->TID;
+
+ // Create copy of name
+ newThread->ThreadName = malloc(strlen(cur->ThreadName)+1);
+ strcpy(newThread->ThreadName, cur->ThreadName);
// Clear message list (messages are not inherited)
newThread->Messages = NULL;
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);
+
+ //Threads_Dump();
return newThread->TID;
}
// 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;
}
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;