# 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 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[MAX_CPUS] = NULL;
+tThread *gCurrentThread[MAX_CPUS] = {NULL};
#else
tThread *gCurrentThread = NULL;
#endif
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");
}
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;