X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=cafb8068d2d92471378c858fea516a1116a22b0a;hb=e573d30162c179edc6de7b7c8364a617d9f25f77;hp=2670a1dd424fe78d0f14125a24c7ff35ed514215;hpb=55048ddf380ad9a4ac6d4ee2cabba160a187c876;p=tpg%2Facess2.git diff --git a/Kernel/threads.c b/Kernel/threads.c index 2670a1dd..cafb8068 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -6,14 +6,24 @@ #include #include #include +#include +// Configuration #define DEBUG_TRACE_TICKETS 0 // Trace ticket counts #define DEBUG_TRACE_STATE 0 // Trace state changes (sleep/wake) +// --- Schedulers --- +#define SCHED_UNDEF 0 +#define SCHED_LOTTERY 1 // Lottery scheduler +#define SCHED_RR_SIM 2 // Single Queue Round Robin +#define SCHED_RR_PRI 3 // Multi Queue Round Robin +// Set scheduler type +#define SCHEDULER_TYPE SCHED_LOTTERY + // === CONSTANTS === #define DEFAULT_QUANTUM 10 -#define DEFAULT_TICKETS 5 -#define MAX_TICKETS 10 +#define DEFAULT_PRIORITY 5 +#define MIN_PRIORITY 10 const enum eConfigTypes cCONFIG_TYPES[] = { CFGT_HEAPSTR, // e.g. CFG_VFS_CWD CFGT_INT, // e.g. CFG_VFS_MAXFILES @@ -22,63 +32,85 @@ const enum eConfigTypes cCONFIG_TYPES[] = { // === IMPORTS === extern void ArchThreads_Init(void); -extern void Proc_Start(void); -extern tThread *Proc_GetCurThread(void); -extern int Proc_Clone(Uint *Err, Uint Flags); extern void Proc_CallFaultHandler(tThread *Thread); +extern int GetCPUNum(void); // === PROTOTYPES === void Threads_Init(void); - int Threads_SetName(char *NewName); +#if 0 + int Threads_SetName(const char *NewName); +#endif char *Threads_GetName(int ID); -void Threads_SetTickets(tThread *Thread, int Num); +#if 0 +void Threads_SetPriority(tThread *Thread, int Pri); tThread *Threads_CloneTCB(Uint *Err, Uint Flags); int Threads_WaitTID(int TID, int *status); tThread *Threads_GetThread(Uint TID); +#endif void Threads_AddToDelete(tThread *Thread); -tThread *Threads_int_GetPrev(tThread **List, tThread *Thread); +tThread *Threads_int_DelFromQueue(tThread **List, tThread *Thread); +#if 0 void Threads_Exit(int TID, int Status); void Threads_Kill(tThread *Thread, int Status); void Threads_Yield(void); void Threads_Sleep(void); int Threads_Wake(tThread *Thread); void Threads_AddActive(tThread *Thread); -void Threads_int_AddActive(tThread *Thread); tThread *Threads_RemActive(void); +#endif +void Threads_Fault(int Num); +void Threads_SegFault(tVAddr Addr); +#if 0 int Threads_GetPID(void); int Threads_GetTID(void); tUID Threads_GetUID(void); - int Threads_SetUID(Uint *Errno, tUID ID); tGID Threads_GetGID(void); + int Threads_SetUID(Uint *Errno, tUID ID); int Threads_SetGID(Uint *Errno, tUID ID); +#endif void Threads_Dump(void); -void Mutex_Acquire(tMutex *Mutex); +void Threads_DumpActive(void); + +#if 0 + int Mutex_Acquire(tMutex *Mutex); void Mutex_Release(tMutex *Mutex); int Mutex_IsLocked(tMutex *Mutex); +#endif // === GLOBALS === // -- Core Thread -- // Only used for the core kernel tThread gThreadZero = { Status: THREAD_STAT_ACTIVE, // Status - ThreadName: "ThreadZero", // Name + ThreadName: (char*)"ThreadZero", // Name Quantum: DEFAULT_QUANTUM, // Default Quantum Remaining: DEFAULT_QUANTUM, // Current Quantum - NumTickets: DEFAULT_TICKETS // Number of tickets + Priority: DEFAULT_PRIORITY // Number of tickets }; // -- Processes -- // --- Locks --- tShortSpinlock glThreadListLock; ///\note NEVER use a heap function while locked // --- Current State --- volatile int giNumActiveThreads = 0; // Number of threads on the active queue -volatile int giFreeTickets = 0; // Number of tickets held by non-scheduled threads volatile Uint giNextTID = 1; // Next TID to allocate // --- Thread Lists --- tThread *gAllThreads = NULL; // All allocated threads -tThread *gActiveThreads = NULL; // Currently Running Threads tThread *gSleepingThreads = NULL; // Sleeping Threads tThread *gDeleteThreads = NULL; // Threads to delete int giNumCPUs = 1; // Number of CPUs +BOOL gaThreads_NoTaskSwitch[MAX_CPUS]; // Disables task switches for each core (Pseudo-IF) +// --- Scheduler Types --- +#if SCHEDULER_TYPE == SCHED_LOTTERY +const int caiTICKET_COUNTS[MIN_PRIORITY+1] = {100,81,64,49,36,25,16,9,4,1,0}; +volatile int giFreeTickets = 0; // Number of tickets held by non-scheduled threads +tThread *gActiveThreads = NULL; // Currently Running Threads +#elif SCHEDULER_TYPE == SCHED_RR_SIM +tThread *gActiveThreads = NULL; // Currently Running Threads +#elif SCHEDULER_TYPE == SCHED_RR_PRI +tThread *gaActiveThreads[MIN_PRIORITY+1]; // Active threads for each priority level +#else +# error "Unkown scheduler type" +#endif // === CODE === /** @@ -90,21 +122,25 @@ void Threads_Init(void) ArchThreads_Init(); // Create Initial Task + #if SCHEDULER_TYPE == SCHED_RR_PRI + gaActiveThreads[gThreadZero.Priority] = &gThreadZero; + #else gActiveThreads = &gThreadZero; + #endif + gAllThreads = &gThreadZero; - //giFreeTickets = gThreadZero.NumTickets; // Not needed, as ThreadZero is scheduled giNumActiveThreads = 1; Proc_Start(); } /** - * \fn void Threads_SetName(char *NewName) + * \fn void Threads_SetName(const char *NewName) * \brief Sets the current thread's name * \param NewName New name for the thread * \return Boolean Failure */ -int Threads_SetName(char *NewName) +int Threads_SetName(const char *NewName) { tThread *cur = Proc_GetCurThread(); char *oldname = cur->ThreadName; @@ -136,31 +172,50 @@ char *Threads_GetName(tTID ID) } /** - * \fn void Threads_SetTickets(tThread *Thread, int Num) - * \brief Sets the 'priority' of a task + * \fn void Threads_SetPriority(tThread *Thread, int Pri) + * \brief Sets the priority of a task * \param Thread Thread to update ticket count (NULL means current thread) - * \param Num New ticket count (must be >= 0, clipped to \a MAX_TICKETS) + * \param Pri New priority */ -void Threads_SetTickets(tThread *Thread, int Num) +void Threads_SetPriority(tThread *Thread, int Pri) { // Get current thread if(Thread == NULL) Thread = Proc_GetCurThread(); // Bounds checking - if(Num < 0) return; - if(Num > MAX_TICKETS) Num = MAX_TICKETS; + // - If < 0, set to lowest priority + if(Pri < 0) Pri = MIN_PRIORITY; + if(Pri > MIN_PRIORITY) Pri = MIN_PRIORITY; + + // Do we actually have to do anything? + if( Pri == Thread->Priority ) return; + #if SCHEDULER_TYPE == SCHED_RR_PRI + SHORTLOCK( &glThreadListLock ); + // Remove from old priority + Threads_int_DelFromQueue( &gaActiveThreads[Thread->Priority], Thread ); + // And add to new + Thread->Next = gaActiveThreads[Pri]; + gaActiveThreads[Pri] = Thread; + Thread->Priority = Pri; + SHORTREL( &glThreadListLock ); + #else // If this isn't the current thread, we need to lock - if( Thread != Proc_GetCurThread() ) { + if( Thread != Proc_GetCurThread() ) + { SHORTLOCK( &glThreadListLock ); - giFreeTickets -= Thread->NumTickets - Num; - Thread->NumTickets = Num; - #if DEBUG_TRACE_TICKETS + + #if SCHEDULER_TYPE == SCHED_LOTTERY + giFreeTickets -= caiTICKET_COUNTS[Thread->Priority] - caiTICKET_COUNTS[Pri]; + # if DEBUG_TRACE_TICKETS Log("Threads_SetTickets: new giFreeTickets = %i", giFreeTickets); + # endif #endif + Thread->Priority = Pri; SHORTREL( &glThreadListLock ); } else - Thread->NumTickets = Num; + Thread->Priority = Pri; + #endif } /** @@ -208,7 +263,76 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) // Set State new->Remaining = new->Quantum = cur->Quantum; - new->NumTickets = cur->NumTickets; + new->Priority = cur->Priority; + + // Set Signal Handlers + new->CurFaultNum = 0; + new->FaultHandler = cur->FaultHandler; + + for( i = 0; i < NUM_CFG_ENTRIES; i ++ ) + { + switch(cCONFIG_TYPES[i]) + { + default: + new->Config[i] = cur->Config[i]; + break; + case CFGT_HEAPSTR: + if(cur->Config[i]) + new->Config[i] = (Uint) strdup( (void*)cur->Config[i] ); + else + new->Config[i] = 0; + break; + } + } + + // Maintain a global list of threads + SHORTLOCK( &glThreadListLock ); + new->GlobalPrev = NULL; // Protect against bugs + new->GlobalNext = gAllThreads; + gAllThreads->GlobalPrev = new; + gAllThreads = new; + SHORTREL( &glThreadListLock ); + + return new; +} + +/** + * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags) + * \brief Clone the TCB of the current thread + */ +tThread *Threads_CloneThreadZero(void) +{ + tThread *cur, *new; + int i; + cur = Proc_GetCurThread(); + + // Allocate and duplicate + new = malloc(sizeof(tThread)); + if(new == NULL) { + return NULL; + } + memcpy(new, &gThreadZero, sizeof(tThread)); + + new->CurCPU = -1; + new->Next = NULL; + memset( &new->IsLocked, 0, sizeof(new->IsLocked)); + new->Status = THREAD_STAT_PREINIT; + new->RetStatus = 0; + + // Get Thread ID + new->TID = giNextTID++; + new->Parent = 0; + + // Clone Name + new->ThreadName = NULL; + + // Messages are not inherited + new->Messages = NULL; + new->LastMessage = NULL; + + // Set State + new->Remaining = new->Quantum = cur->Quantum; + new->Priority = cur->Priority; // Set Signal Handlers new->CurFaultNum = 0; @@ -234,6 +358,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) SHORTLOCK( &glThreadListLock ); new->GlobalPrev = NULL; // Protect against bugs new->GlobalNext = gAllThreads; + gAllThreads->GlobalPrev = new; gAllThreads = new; SHORTREL( &glThreadListLock ); @@ -362,33 +487,36 @@ void Threads_AddToDelete(tThread *Thread) } /** - * \brief Gets the previous entry in a thead linked list + * \brief Deletes an entry from a list * \param List Pointer to the list head * \param Thread Thread to find - * \return Thread before \a Thread on \a List - * \note This uses a massive hack of assuming that the first field in the - * structure is the .Next pointer. By doing this, we can return \a List - * as a (tThread*) and simplify other code. + * \return \a Thread */ -tThread *Threads_int_GetPrev(tThread **List, tThread *Thread) +tThread *Threads_int_DelFromQueue(tThread **List, tThread *Thread) { - tThread *ret; - // First Entry - if(*List == Thread) { - return (tThread*)List; + tThread *ret, *prev = NULL; + + for(ret = *List; + ret && ret != Thread; + prev = ret, ret = ret->Next + ); + + // Is the thread on the list + if(!ret) { + //LogF("%p(%s) is not on list %p\n", Thread, Thread->ThreadName, List); + return NULL; + } + + if( !prev ) { + *List = Thread->Next; + //LogF("%p(%s) removed from head of %p\n", Thread, Thread->ThreadName, List); } - // Or not else { - for(ret = *List; - ret->Next && ret->Next != Thread; - ret = ret->Next - ); - // Error if the thread is not on the list - if(!ret->Next || ret->Next != Thread) { - return NULL; - } + prev->Next = Thread->Next; + //LogF("%p(%s) removed from %p (prev=%p)\n", Thread, Thread->ThreadName, List, prev); } - return ret; + + return Thread; } /** @@ -415,19 +543,19 @@ void Threads_Exit(int TID, int Status) */ void Threads_Kill(tThread *Thread, int Status) { - tThread *prev; tMsg *msg; + int isCurThread = Thread == Proc_GetCurThread(); // TODO: Kill all children - #if 0 + #if 1 { tThread *child; // TODO: I should keep a .Parent pointer, and a .Children list - for(child = gActiveThreads; + for(child = gAllThreads; child; - child = child->Next) + child = child->GlobalNext) { - if(child->PTID == Thread->TID) + if(child->Parent == Thread) Threads_Kill(child, -1); } } @@ -438,35 +566,73 @@ void Threads_Kill(tThread *Thread, int Status) // Lock thread (stop us recieving messages) SHORTLOCK( &Thread->IsLocked ); - // Lock thread list - SHORTLOCK( &glThreadListLock ); - - // Get previous thread on list - prev = Threads_int_GetPrev( &gActiveThreads, Thread ); - if(!prev) { - Warning("Proc_Exit - Current thread is not on the active queue"); - SHORTREL( &glThreadListLock ); - SHORTREL( &Thread->IsLocked ); - return; - } - // Clear Message Queue while( Thread->Messages ) { msg = Thread->Messages->Next; - free( Thread->Messages ); // BIG NO-NO + free( Thread->Messages ); Thread->Messages = msg; } - // Ensure that we are not rescheduled - Thread->Remaining = 0; // Clear Remaining Quantum - Thread->Quantum = 0; // Clear Quantum to indicate dead thread - prev->Next = Thread->Next; // Remove from active + // Lock thread list + SHORTLOCK( &glThreadListLock ); - // Update bookkeeping - giNumActiveThreads --; - if( Thread != Proc_GetCurThread() ) - giFreeTickets -= Thread->NumTickets; + switch(Thread->Status) + { + case THREAD_STAT_PREINIT: // Only on main list + break; + + // Currently active thread + case THREAD_STAT_ACTIVE: + #if SCHEDULER_TYPE == SCHED_RR_PRI + if( Threads_int_DelFromQueue( &gaActiveThreads[Thread->Priority], Thread ) ) + #else + if( Threads_int_DelFromQueue( &gActiveThreads, Thread ) ) + #endif + { + // Ensure that we are not rescheduled + Thread->Remaining = 0; // Clear Remaining Quantum + Thread->Quantum = 0; // Clear Quantum to indicate dead thread + + // Update bookkeeping + giNumActiveThreads --; + #if SCHEDULER_TYPE == SCHED_LOTTERY + if( Thread != Proc_GetCurThread() ) + giFreeTickets -= caiTICKET_COUNTS[ Thread->Priority ]; + #endif + } + else + { + Log_Warning("Threads", + "Threads_Kill - Thread %p(%i,%s) marked as active, but not on list", + Thread, Thread->TID, Thread->ThreadName + ); + } + break; + // Kill it while it sleeps! + case THREAD_STAT_SLEEPING: + if( !Threads_int_DelFromQueue( &gSleepingThreads, Thread ) ) + { + Log_Warning("Threads", + "Threads_Kill - Thread %p(%i,%s) marked as sleeping, but not on list", + Thread, Thread->TID, Thread->ThreadName + ); + } + break; + + // Brains!... You cannot kill + case THREAD_STAT_ZOMBIE: + Log_Warning("Threads", "Threads_Kill - Thread %p(%i,%s) is undead, you cannot kill it", + Thread, Thread->TID, Thread->ThreadName); + SHORTREL( &glThreadListLock ); + SHORTREL( &Thread->IsLocked ); + return ; + + default: + Log_Warning("Threads", "Threads_Kill - BUG Un-checked status (%i)", + Thread->Status); + break; + } // Save exit status Thread->RetStatus = Status; @@ -482,14 +648,14 @@ void Threads_Kill(tThread *Thread, int Status) Threads_Wake( Thread->Parent ); } - Log("Thread %i went *hurk* (%i)", Thread->TID, Thread->Status); + Log("Thread %i went *hurk* (%i)", Thread->TID, Status); // Release spinlocks SHORTREL( &glThreadListLock ); SHORTREL( &Thread->IsLocked ); // TODO: We may not actually be released... // And, reschedule - if(Status != -1) { + if(isCurThread) { for( ;; ) HALT(); } @@ -553,39 +719,38 @@ void Threads_Sleep(void) */ int Threads_Wake(tThread *Thread) { - tThread *prev; - if(!Thread) return -EINVAL; switch(Thread->Status) { case THREAD_STAT_ACTIVE: - Log("Thread_Wake: Waking awake thread (%i)", Thread->TID); + Log("Threads_Wake - Waking awake thread (%i)", Thread->TID); return -EALREADY; case THREAD_STAT_SLEEPING: + SHORTLOCK( &glThreadListLock ); // Remove from sleeping queue - prev = Threads_int_GetPrev(&gSleepingThreads, Thread); - prev->Next = Thread->Next; + Threads_int_DelFromQueue(&gSleepingThreads, Thread); - Threads_int_AddActive( Thread ); + Threads_AddActive( Thread ); #if DEBUG_TRACE_STATE Log("Threads_Sleep: %p (%i %s) woken", Thread, Thread->TID, Thread->ThreadName); #endif + SHORTREL( &glThreadListLock ); return -EOK; case THREAD_STAT_WAITING: - Warning("Thread_Wake - Waiting threads are not currently supported"); + Warning("Threads_Wake - Waiting threads are not currently supported"); return -ENOTIMPL; case THREAD_STAT_DEAD: - Warning("Thread_Wake - Attempt to wake dead thread (%i)", Thread->TID); + Warning("Threads_Wake - Attempt to wake dead thread (%i)", Thread->TID); return -ENOTIMPL; default: - Warning("Thread_Wake - Unknown process status (%i)\n", Thread->Status); + Warning("Threads_Wake - Unknown process status (%i)\n", Thread->Status); return -EINTERNAL; } } @@ -601,9 +766,7 @@ int Threads_WakeTID(tTID TID) int ret; if(!thread) return -ENOENT; - SHORTLOCK( &glThreadListLock ); ret = Threads_Wake( thread ); - SHORTREL( &glThreadListLock ); //Log_Debug("Threads", "TID %i woke %i (%p)", Threads_GetTID(), TID, thread); return ret; } @@ -614,30 +777,37 @@ int Threads_WakeTID(tTID TID) void Threads_AddActive(tThread *Thread) { SHORTLOCK( &glThreadListLock ); - Threads_int_AddActive(Thread); - SHORTREL( &glThreadListLock ); -} - -/** - * \brief Adds a thread to the active queue - * \note This version MUST have the thread list lock held - */ -void Threads_int_AddActive(tThread *Thread) -{ - // Add to active list - Thread->Next = gActiveThreads; - gActiveThreads = Thread; + + if( Thread->Status == THREAD_STAT_ACTIVE ) { + tThread *cur = Proc_GetCurThread(); + Warning("WTF, CPU%i %p (%i %s) is adding %p (%i %s) when it is active", + GetCPUNum(), cur, cur->TID, cur->ThreadName, Thread, Thread->TID, Thread->ThreadName); + } + // Set state Thread->Status = THREAD_STAT_ACTIVE; Thread->CurCPU = -1; + // Add to active list + #if SCHEDULER_TYPE == SCHED_RR_PRI + Thread->Next = gaActiveThreads[Thread->Priority]; + gaActiveThreads[Thread->Priority] = Thread; + #else + Thread->Next = gActiveThreads; + gActiveThreads = Thread; + #endif // Update bookkeeping giNumActiveThreads ++; - giFreeTickets += Thread->NumTickets; - #if DEBUG_TRACE_TICKETS - Log("Threads_int_AddActive: new giFreeTickets = %i", giFreeTickets); + #if SCHEDULER_TYPE == SCHED_LOTTERY + giFreeTickets += caiTICKET_COUNTS[ Thread->Priority ]; + # if DEBUG_TRACE_TICKETS + Log("Threads_AddActive: CPU%i %p %i (%s) added, new giFreeTickets = %i", + GetCPUNum(), Thread, Thread->TID, Thread->ThreadName, giFreeTickets); + # endif #endif + + SHORTREL( &glThreadListLock ); } /** @@ -648,12 +818,34 @@ void Threads_int_AddActive(tThread *Thread) tThread *Threads_RemActive(void) { tThread *ret = Proc_GetCurThread(); - tThread *prev = Threads_int_GetPrev(&gActiveThreads, ret); - if(!prev) return NULL; + + SHORTLOCK( &glThreadListLock ); + + // Delete from active queue + #if SCHEDULER_TYPE == SCHED_RR_PRI + if( !Threads_int_DelFromQueue(&gaActiveThreads[ret->Priority], ret) ) + #else + if( !Threads_int_DelFromQueue(&gActiveThreads, ret) ) + #endif + { + SHORTREL( &glThreadListLock ); + return NULL; + } + + ret->Next = NULL; ret->Remaining = 0; ret->CurCPU = -1; - prev->Next = ret->Next; + giNumActiveThreads --; + // no need to decrement tickets, scheduler did it for us + + #if SCHEDULER_TYPE == SCHED_LOTTERY && DEBUG_TRACE_TICKETS + Log("Threads_RemActive: CPU%i %p %i (%s) removed, giFreeTickets = %i", + GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets); + #endif + + SHORTREL( &glThreadListLock ); + return ret; } @@ -704,6 +896,17 @@ void Threads_Fault(int Num) Proc_CallFaultHandler(thread); } +/** + * \fn void Threads_SegFault(tVAddr Addr) + * \brief Called when a Segment Fault occurs + */ +void Threads_SegFault(tVAddr Addr) +{ + Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr); + Threads_Fault( 1 ); + //Threads_Exit( 0, -1 ); +} + // --- Process Structure Access Functions --- tPID Threads_GetPID(void) { @@ -748,30 +951,72 @@ int Threads_SetGID(Uint *Errno, tGID ID) /** * \fn void Threads_Dump(void) - * \brief Dums a list of currently running threads */ -void Threads_Dump(void) +void Threads_DumpActive(void) { tThread *thread; + #if SCHEDULER_TYPE == SCHED_RR_PRI + int i; + #endif - Log("Active Threads:"); - for(thread=gActiveThreads;thread;thread=thread->Next) + Log("Active Threads: (%i reported)", giNumActiveThreads); + + #if SCHEDULER_TYPE == SCHED_RR_PRI + for( i = 0; i < MIN_PRIORITY+1; i++ ) { - Log(" %i (%i) - %s (CPU %i)", - thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); - if(thread->Status != THREAD_STAT_ACTIVE) - Log(" ERROR State (%i) != THREAD_STAT_ACTIVE (%i)", thread->Status, THREAD_STAT_ACTIVE); - Log(" %i Tickets, Quantum %i", thread->NumTickets, thread->Quantum); - Log(" KStack 0x%x", thread->KernelStack); + for(thread=gaActiveThreads[i];thread;thread=thread->Next) + #else + for(thread=gActiveThreads;thread;thread=thread->Next) + #endif + { + Log(" %p %i (%i) - %s (CPU %i)", + thread, thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); + if(thread->Status != THREAD_STAT_ACTIVE) + Log(" ERROR State (%i) != THREAD_STAT_ACTIVE (%i)", thread->Status, THREAD_STAT_ACTIVE); + Log(" Priority %i, Quantum %i", thread->Priority, thread->Quantum); + Log(" KStack 0x%x", thread->KernelStack); + } + + #if SCHEDULER_TYPE == SCHED_RR_PRI } + #endif +} + +/** + * \fn void Threads_Dump(void) + * \brief Dumps a list of currently running threads + */ +void Threads_Dump(void) +{ + tThread *thread; + + Log("--- Thread Dump ---"); + Threads_DumpActive(); Log("All Threads:"); for(thread=gAllThreads;thread;thread=thread->GlobalNext) { - Log(" %i (%i) - %s (CPU %i)", - thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); - Log(" State %i", thread->Status); - Log(" %i Tickets, Quantum %i", thread->NumTickets, thread->Quantum); + Log(" %p %i (%i) - %s (CPU %i)", + thread, thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); + Log(" State %i (%s)", thread->Status, casTHREAD_STAT[thread->Status]); + switch(thread->Status) + { + case THREAD_STAT_MUTEXSLEEP: + Log(" Mutex Pointer: %p", thread->WaitPointer); + break; + case THREAD_STAT_SEMAPHORESLEEP: + Log(" Semaphore Pointer: %p", thread->WaitPointer); + Log(" Semaphore Name: %s:%s", + ((tSemaphore*)thread->WaitPointer)->ModName, + ((tSemaphore*)thread->WaitPointer)->Name + ); + break; + case THREAD_STAT_ZOMBIE: + Log(" Return Status: %i", thread->RetStatus); + break; + default: break; + } + Log(" Priority %i, Quantum %i", thread->Priority, thread->Quantum); Log(" KStack 0x%x", thread->KernelStack); } } @@ -784,20 +1029,30 @@ void Threads_Dump(void) tThread *Threads_GetNextToRun(int CPU, tThread *Last) { tThread *thread; - int ticket; - int number; + // If this CPU has the lock, we must let it complete + if( CPU_HAS_LOCK( &glThreadListLock ) ) + return Last; + + // Don't change threads if the current CPU has switches disabled + if( gaThreads_NoTaskSwitch[CPU] ) + return Last; + + // Lock thread list SHORTLOCK( &glThreadListLock ); // Clear Delete Queue // - I should probably put this in a worker thread to avoid calling free() in the scheduler + // DEFINITELY - free() can deadlock in this case while(gDeleteThreads) { thread = gDeleteThreads->Next; - if( IS_LOCKED(&gDeleteThreads->IsLocked) ) { // Only free if structure is unused + // Only free if structure is unused + if( !IS_LOCKED(&gDeleteThreads->IsLocked) ) + { // Set to dead - gDeleteThreads->Status = THREAD_STAT_DEAD; + gDeleteThreads->Status = THREAD_STAT_BURIED; // Free name if( IsHeap(gDeleteThreads->ThreadName) ) free(gDeleteThreads->ThreadName); @@ -820,101 +1075,171 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) return NULL; } + #if SCHEDULER_TYPE != SCHED_RR_PRI // Special case: 1 thread if(giNumActiveThreads == 1) { if( gActiveThreads->CurCPU == -1 ) gActiveThreads->CurCPU = CPU; + SHORTREL( &glThreadListLock ); + if( gActiveThreads->CurCPU == CPU ) return gActiveThreads; + return NULL; // CPU has nothing to do } + #endif // Allow the old thread to be scheduled again if( Last ) { if( Last->Status == THREAD_STAT_ACTIVE ) { - giFreeTickets += Last->NumTickets; - #if DEBUG_TRACE_TICKETS + #if SCHEDULER_TYPE == SCHED_LOTTERY + giFreeTickets += caiTICKET_COUNTS[ Last->Priority ]; + # if DEBUG_TRACE_TICKETS LogF(" CPU %i released %p (%i %s) into the pool (%i tickets in pool)\n", CPU, Last, Last->TID, Last->ThreadName, giFreeTickets); + # endif #endif } - #if DEBUG_TRACE_TICKETS + #if SCHEDULER_TYPE == SCHED_LOTTERY && DEBUG_TRACE_TICKETS else - LogF(" %p (%s)->Status = %i (Released)\n", Last, Last->ThreadName, Last->Status); + LogF(" CPU %i released %p (%i %s)->Status = %i (Released)\n", + CPU, Last, Last->TID, Last->ThreadName, Last->Status); #endif Last->CurCPU = -1; } - #if 1 - number = 0; - for(thread = gActiveThreads; thread; thread = thread->Next) { - if(thread->CurCPU >= 0) continue; - number += thread->NumTickets; - } - if(number != giFreeTickets) { - Panic("Bookkeeping fail (giFreeTickets(%i) != number(%i)) - CPU%i", - giFreeTickets, number, CPU); - } - #endif - - // No free tickets (all tasks delegated to cores) - if( giFreeTickets == 0 ) { - SHORTREL(&glThreadListLock); - return NULL; + // --- + // Lottery Scheduler + // --- + #if SCHEDULER_TYPE == SCHED_LOTTERY + { + int ticket, number; + # if 1 + number = 0; + for(thread = gActiveThreads; thread; thread = thread->Next) { + if(thread->CurCPU >= 0) continue; + if(thread->Status != THREAD_STAT_ACTIVE) + Panic("Bookkeeping fail - %p %i(%s) is on the active queue with a status of %i", + thread, thread->TID, thread->ThreadName, thread->Status); + if(thread->Next == thread) { + Panic("Bookkeeping fail - %p %i(%s) loops back on itself", + thread, thread->TID, thread->ThreadName, thread->Status); + } + number += caiTICKET_COUNTS[ thread->Priority ]; + } + if(number != giFreeTickets) { + Panic("Bookkeeping fail (giFreeTickets(%i) != number(%i)) - CPU%i", + giFreeTickets, number, CPU); + } + # endif + + // No free tickets (all tasks delegated to cores) + if( giFreeTickets == 0 ) { + SHORTREL(&glThreadListLock); + return NULL; + } + + // Get the ticket number + ticket = number = rand() % giFreeTickets; + + // Find the next thread + for(thread=gActiveThreads;thread;thread=thread->Next) + { + if(thread->CurCPU >= 0) continue; + if( caiTICKET_COUNTS[ thread->Priority ] > number) break; + number -= caiTICKET_COUNTS[ thread->Priority ]; + } + + // If we didn't find a thread, something went wrong + if(thread == NULL) + { + number = 0; + for(thread=gActiveThreads;thread;thread=thread->Next) { + if(thread->CurCPU >= 0) continue; + number += caiTICKET_COUNTS[ thread->Priority ]; + } + Panic("Bookeeping Failed - giFreeTickets(%i) > true count (%i)", + giFreeTickets, number); + } + # if DEBUG_TRACE_TICKETS + LogF(" CPU%i giFreeTickets = %i, running %p (%i %s CPU=%i)\n", + CPU, giFreeTickets, thread, thread->TID, thread->ThreadName, thread->CurCPU); + # endif + + giFreeTickets -= caiTICKET_COUNTS[ thread->Priority ]; } - // Get the ticket number - ticket = number = rand() % giFreeTickets; - - // Find the next thread - for(thread=gActiveThreads;thread;thread=thread->Next) + // --- + // Priority based round robin scheduler + // --- + #elif SCHEDULER_TYPE == SCHED_RR_PRI { - if(thread->CurCPU >= 0) continue; - if(thread->NumTickets > number) break; - number -= thread->NumTickets; + int i; + for( i = 0; i < MIN_PRIORITY + 1; i ++ ) + { + for(thread = gaActiveThreads[i]; thread; thread = thread->Next) + { + if( thread->CurCPU == -1 ) break; + } + // If we fall onto the same queue again, special handling is + // needed + if( i == Last->Priority ) { + tThread *savedThread = thread; + + // Find the next unscheduled thread in the list + for( thread = Last->Next; thread; thread = thread->Next ) + { + if( thread->CurCPU == -1 ) break; + } + // If we don't find anything after, just use the one + // found above. + if( !thread ) thread = savedThread; + } + // Found a thread? Schedule it! + if( thread ) break; + } + + // Anything to do? + if( !thread ) { + SHORTREL(&glThreadListLock); + return NULL; + } } - // Error Check - if(thread == NULL) - { - number = 0; - for(thread=gActiveThreads;thread;thread=thread->Next) { - if(thread->CurCPU >= 0) continue; - number += thread->NumTickets; + #elif SCHEDULER_TYPE == SCHED_RR_SIM + { + // Find the next unscheduled thread in the list + for( thread = Last->Next; thread; thread = thread->Next ) + { + if( thread->CurCPU == -1 ) break; + } + // If we don't find anything after, search from the beginning + if( !thread ) + { + for(thread = gActiveThreads; thread; thread = thread->Next) + { + if( thread->CurCPU == -1 ) break; + } + } + + // Anything to do? + if( !thread ) { + SHORTREL(&glThreadListLock); + return NULL; } - Panic("Bookeeping Failed - giFreeTickets(%i) > true count (%i)", - giFreeTickets, number); } - #if DEBUG_TRACE_TICKETS - LogF(" CPU%i giFreeTickets = %i\n", CPU, giFreeTickets); + #else + # error "Unimplemented scheduling algorithm" #endif // Make the new thread non-schedulable - giFreeTickets -= thread->NumTickets; thread->CurCPU = CPU; - //Threads_Dump(); - #if DEBUG_TRACE_TICKETS - LogF(" CPU%i giFreeTickets = %i, giving %p (%i %s CPU=%i)\n", - CPU, giFreeTickets, thread, thread->TID, thread->ThreadName, thread->CurCPU); - #endif - SHORTREL( &glThreadListLock ); return thread; } -/** - * \fn void Threads_SegFault(tVAddr Addr) - * \brief Called when a Segment Fault occurs - */ -void Threads_SegFault(tVAddr Addr) -{ - Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr); - Threads_Fault( 1 ); - //Threads_Exit( 0, -1 ); -} - /** * \brief Acquire a heavy mutex * \param Mutex Mutex to acquire @@ -925,7 +1250,7 @@ void Threads_SegFault(tVAddr Addr) * the oldest thread (top thread) on the queue is given the lock and * restarted. */ -void Mutex_Acquire(tMutex *Mutex) +int Mutex_Acquire(tMutex *Mutex) { tThread *us = Proc_GetCurThread(); @@ -938,9 +1263,11 @@ void Mutex_Acquire(tMutex *Mutex) if( Mutex->Owner ) { SHORTLOCK( &glThreadListLock ); // - Remove from active list - Threads_RemActive(); + us = Threads_RemActive(); + us->Next = NULL; // - Mark as sleeping - us->Status = THREAD_STAT_OFFSLEEP; + us->Status = THREAD_STAT_MUTEXSLEEP; + us->WaitPointer = Mutex; // - Add to waiting if(Mutex->LastWaiting) { @@ -951,21 +1278,41 @@ void Mutex_Acquire(tMutex *Mutex) Mutex->Waiting = us; Mutex->LastWaiting = us; } + #if 0 + { + int i = 0; + tThread *t; + for( t = Mutex->Waiting; t; t = t->Next, i++ ) + Log("[%i] (tMutex)%p->Waiting[%i] = %p (%i %s)", us->TID, Mutex, i, + t, t->TID, t->ThreadName); + } + #endif + SHORTREL( &glThreadListLock ); SHORTREL( &Mutex->Protector ); - while(us->Status == THREAD_STAT_OFFSLEEP) Threads_Yield(); + while(us->Status == THREAD_STAT_MUTEXSLEEP) Threads_Yield(); // We're only woken when we get the lock + us->WaitPointer = NULL; } // Ooh, let's take it! else { Mutex->Owner = us; SHORTREL( &Mutex->Protector ); } + + #if 0 + extern tMutex glPhysAlloc; + if( Mutex != &glPhysAlloc ) + LogF("Mutex %p taken by %i %p\n", Mutex, us->TID, __builtin_return_address(0)); + #endif + + return 0; } /** * \brief Release a held mutex * \param Mutex Mutex to release + * \note Releasing a non-held mutex has no effect */ void Mutex_Release(tMutex *Mutex) { @@ -974,14 +1321,29 @@ void Mutex_Release(tMutex *Mutex) if( Mutex->Waiting ) { Mutex->Owner = Mutex->Waiting; // Set owner Mutex->Waiting = Mutex->Waiting->Next; // Next! + // Reset ->LastWaiting to NULL if we have just removed the last waiting thread + // 2010-10-02 21:50 - Comemerating the death of the longest single + // blocker in the Acess2 history. REMEMBER TO + // FUCKING MAINTAIN YOUR FUCKING LISTS DIPWIT + if( Mutex->LastWaiting == Mutex->Owner ) + Mutex->LastWaiting = NULL; + // Wake new owner - Threads_AddActive(Mutex->Owner); - //Log("Mutex %p Woke %p", Mutex, Mutex->Owner); + SHORTLOCK( &glThreadListLock ); + if( Mutex->Owner->Status != THREAD_STAT_ACTIVE ) + Threads_AddActive(Mutex->Owner); + SHORTREL( &glThreadListLock ); } else { Mutex->Owner = NULL; } SHORTREL( &Mutex->Protector ); + + #if 0 + extern tMutex glPhysAlloc; + if( Mutex != &glPhysAlloc ) + LogF("Mutex %p released by %i %p\n", Mutex, Threads_GetTID(), __builtin_return_address(0)); + #endif } /** @@ -993,8 +1355,212 @@ int Mutex_IsLocked(tMutex *Mutex) return Mutex->Owner != NULL; } +// +// Initialise a semaphore +// +void Semaphore_Init(tSemaphore *Sem, int Value, int MaxValue, const char *Module, const char *Name) +{ + Sem->Value = Value; + Sem->ModName = Module; + Sem->Name = Name; +} +// +// Wait for items to be avaliable +// +int Semaphore_Wait(tSemaphore *Sem, int MaxToTake) +{ + tThread *us; + int taken; + if( MaxToTake < 0 ) { + Log_Warning("Threads", "Semaphore_Wait: User bug - MaxToTake(%i) < 0, Sem=%p(%s)", + MaxToTake, Sem, Sem->Name); + } + + SHORTLOCK( &Sem->Protector ); + + // Check if there's already items avaliable + if( Sem->Value > 0 ) { + // Take what we need + if( MaxToTake && Sem->Value > MaxToTake ) + taken = MaxToTake; + else + taken = Sem->Value; + Sem->Value -= taken; + SHORTREL( &Sem->Protector ); + } + else + { + SHORTLOCK( &glThreadListLock ); + + // - Remove from active list + us = Threads_RemActive(); + us->Next = NULL; + // - Mark as sleeping + us->Status = THREAD_STAT_SEMAPHORESLEEP; + us->WaitPointer = Sem; + us->RetStatus = MaxToTake; // Use RetStatus as a temp variable + + // - Add to waiting + if(Sem->LastWaiting) { + Sem->LastWaiting->Next = us; + Sem->LastWaiting = us; + } + else { + Sem->Waiting = us; + Sem->LastWaiting = us; + } + + SHORTREL( &glThreadListLock ); + SHORTREL( &Sem->Protector ); + while(us->Status == THREAD_STAT_SEMAPHORESLEEP) Threads_Yield(); + // We're only woken when there's something avaliable + us->WaitPointer = NULL; + + taken = us->RetStatus; + + // Get the lock again + SHORTLOCK( &Sem->Protector ); + } + + // While there is space, and there are thread waiting + // wake the first thread and give it what it wants (or what's left) + while( (Sem->MaxValue == 0 || Sem->Value < Sem->MaxValue) && Sem->Signaling ) + { + int given; + tThread *toWake = Sem->Signaling; + + Sem->Signaling = Sem->Signaling->Next; + // Reset ->LastWaiting to NULL if we have just removed the last waiting thread + if( Sem->Signaling == NULL ) + Sem->LastSignaling = NULL; + + // Figure out how much to give + if( toWake->RetStatus && Sem->Value + toWake->RetStatus < Sem->MaxValue ) + given = toWake->RetStatus; + else + given = Sem->MaxValue - Sem->Value; + Sem->Value -= given; + + // Save the number we gave to the thread's status + toWake->RetStatus = given; + + // Wake the sleeper + SHORTLOCK( &glThreadListLock ); + if( toWake->Status != THREAD_STAT_ACTIVE ) + Threads_AddActive(toWake); + SHORTREL( &glThreadListLock ); + } + SHORTREL( &Sem->Protector ); + + return taken; +} + +// +// Add items to a semaphore +// +int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd) +{ + int given; + int added; + + if( AmmountToAdd < 0 ) { + Log_Warning("Threads", "Semaphore_Signal: User bug - AmmountToAdd(%i) < 0, Sem=%p(%s)", + AmmountToAdd, Sem, Sem->Name); + } + SHORTLOCK( &Sem->Protector ); + + // Check if we have to block + if( Sem->MaxValue && Sem->Value == Sem->MaxValue ) + { + tThread *us; + SHORTLOCK( &glThreadListLock ); + + // - Remove from active list + us = Threads_RemActive(); + us->Next = NULL; + // - Mark as sleeping + us->Status = THREAD_STAT_SEMAPHORESLEEP; + us->WaitPointer = Sem; + us->RetStatus = AmmountToAdd; // Use RetStatus as a temp variable + + // - Add to waiting + if(Sem->LastSignaling) { + Sem->LastSignaling->Next = us; + Sem->LastSignaling = us; + } + else { + Sem->Signaling = us; + Sem->LastSignaling = us; + } + + SHORTREL( &glThreadListLock ); + SHORTREL( &Sem->Protector ); + while(us->Status == THREAD_STAT_SEMAPHORESLEEP) Threads_Yield(); + // We're only woken when there's something avaliable + us->WaitPointer = NULL; + + added = us->RetStatus; + + // Get the lock again + SHORTLOCK( &Sem->Protector ); + } + // Non blocking + else + { + // Figure out how much we need to take off + if( Sem->MaxValue && Sem->Value + AmmountToAdd > Sem->MaxValue) + added = Sem->MaxValue - Sem->Value; + else + added = AmmountToAdd; + Sem->Value += added; + } + + // While there are items avaliable, and there are thread waiting + // wake the first thread and give it what it wants (or what's left) + while( Sem->Value && Sem->Waiting ) + { + tThread *toWake = Sem->Waiting; + + Sem->Waiting = Sem->Waiting->Next; + // Reset ->LastWaiting to NULL if we have just removed the last waiting thread + if( Sem->Waiting == NULL ) + Sem->LastWaiting = NULL; + + // Figure out how much to give + if( toWake->RetStatus && Sem->Value > toWake->RetStatus ) + given = toWake->RetStatus; + else + given = Sem->Value; + Sem->Value -= given; + + // Save the number we gave to the thread's status + toWake->RetStatus = given; + + // Wake the sleeper + SHORTLOCK( &glThreadListLock ); + if( toWake->Status != THREAD_STAT_ACTIVE ) + Threads_AddActive(toWake); + SHORTREL( &glThreadListLock ); + } + SHORTREL( &Sem->Protector ); + + return added; +} + +// +// Get the current value of a semaphore +// +int Semaphore_GetValue(tSemaphore *Sem) +{ + return Sem->Value; +} + // === EXPORTS === EXPORT(Threads_GetUID); +EXPORT(Threads_GetGID); EXPORT(Mutex_Acquire); EXPORT(Mutex_Release); EXPORT(Mutex_IsLocked); +EXPORT(Semaphore_Init); +EXPORT(Semaphore_Wait); +EXPORT(Semaphore_Signal);