X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=956eede82281ff1e3153bc6da1d090c22943d478;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=5d15c929c431324cbacffb06acd3ed8dbf29df2e;hpb=270e5fe88b0666021a7a6393334db7feeb8245f8;p=tpg%2Facess2.git diff --git a/Kernel/threads.c b/Kernel/threads.c index 5d15c929..956eede8 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -5,7 +5,11 @@ */ #include #include +#include #include +#include +#include +#include // VFS Handle maintainence // Configuration #define DEBUG_TRACE_TICKETS 0 // Trace ticket counts @@ -17,36 +21,38 @@ #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 +#define SCHEDULER_TYPE SCHED_RR_PRI // === CONSTANTS === -#define DEFAULT_QUANTUM 10 +#define DEFAULT_QUANTUM 5 #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 - CFGT_NULL -}; // === 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); + +// === TYPE === +typedef struct +{ + tThread *Head; + tThread *Tail; +} tThreadList; // === PROTOTYPES === void Threads_Init(void); +#if 0 +void Threads_Delete(tThread *Thread); int Threads_SetName(const char *NewName); -char *Threads_GetName(int ID); +#endif +char *Threads_GetName(tTID ID); +#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); -void Threads_AddToDelete(tThread *Thread); -tThread *Threads_int_DelFromQueue(tThread **List, tThread *Thread); +#endif +tThread *Threads_int_DelFromQueue(tThreadList *List, tThread *Thread); +void Threads_int_AddToList(tThreadList *List, tThread *Thread); +#if 0 void Threads_Exit(int TID, int Status); void Threads_Kill(tThread *Thread, int Status); void Threads_Yield(void); @@ -54,28 +60,32 @@ void Threads_Sleep(void); int Threads_Wake(tThread *Thread); void Threads_AddActive(tThread *Thread); tThread *Threads_RemActive(void); +#endif +void Threads_ToggleTrace(int TID); +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 Threads_DumpActive(void); -void Mutex_Acquire(tMutex *Mutex); -void Mutex_Release(tMutex *Mutex); - int Mutex_IsLocked(tMutex *Mutex); - // === GLOBALS === // -- Core Thread -- +struct sProcess gProcessZero = { + }; // Only used for the core kernel tThread gThreadZero = { - Status: THREAD_STAT_ACTIVE, // Status - ThreadName: "ThreadZero", // Name - Quantum: DEFAULT_QUANTUM, // Default Quantum - Remaining: DEFAULT_QUANTUM, // Current Quantum - Priority: DEFAULT_PRIORITY // Number of tickets + .Status = THREAD_STAT_ACTIVE, // Status + .ThreadName = (char*)"ThreadZero", // Name + .Quantum = DEFAULT_QUANTUM, // Default Quantum + .Remaining = DEFAULT_QUANTUM, // Current Quantum + .Priority = DEFAULT_PRIORITY // Number of tickets }; // -- Processes -- // --- Locks --- @@ -85,19 +95,18 @@ volatile int giNumActiveThreads = 0; // Number of threads on the active queue volatile Uint giNextTID = 1; // Next TID to allocate // --- Thread Lists --- tThread *gAllThreads = NULL; // All allocated threads -tThread *gSleepingThreads = NULL; // Sleeping Threads -tThread *gDeleteThreads = NULL; // Threads to delete +tThreadList gSleepingThreads; // Sleeping Threads 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 +tThreadList gActiveThreads; // Currently Running Threads #elif SCHEDULER_TYPE == SCHED_RR_SIM -tThread *gActiveThreads = NULL; // Currently Running Threads +tThreadList gActiveThreads; // Currently Running Threads #elif SCHEDULER_TYPE == SCHED_RR_PRI -tThread *gaActiveThreads[MIN_PRIORITY+1]; // Active threads for each priority level +tThreadList gaActiveThreads[MIN_PRIORITY+1]; // Active threads for each priority level #else # error "Unkown scheduler type" #endif @@ -111,19 +120,65 @@ void Threads_Init(void) { ArchThreads_Init(); + Log_Debug("Threads", "Offsets of tThread"); + Log_Debug("Threads", ".Priority = %i", offsetof(tThread, Priority)); + Log_Debug("Threads", ".KernelStack = %i", offsetof(tThread, KernelStack)); + // Create Initial Task - #if SCHEDULER_TYPE == SCHED_RR_PRI - gaActiveThreads[gThreadZero.Priority] = &gThreadZero; - #else - gActiveThreads = &gThreadZero; - #endif +// #if SCHEDULER_TYPE == SCHED_RR_PRI +// gaActiveThreads[gThreadZero.Priority].Head = &gThreadZero; +// gaActiveThreads[gThreadZero.Priority].Tail = &gThreadZero; +// #else +// gActiveThreads.Head = &gThreadZero; +// gActiveThreads.Tail = &gThreadZero; +// #endif gAllThreads = &gThreadZero; giNumActiveThreads = 1; + gThreadZero.Process = &gProcessZero; Proc_Start(); } +void Threads_Delete(tThread *Thread) +{ + // Set to dead + Thread->Status = THREAD_STAT_BURIED; + + // Clear out process state + Proc_ClearThread(Thread); + + Thread->Process->nThreads --; + if( Thread->Process->nThreads == 0 ) + { + tProcess *proc = Thread->Process; + // VFS Cleanup + VFS_CloseAllUserHandles(); + // Architecture cleanup + Proc_ClearProcess( proc ); + // VFS Configuration strings + if( proc->CurrentWorkingDir) + free( proc->CurrentWorkingDir ); + if( proc->RootDir ) + free( proc->RootDir ); + // Process descriptor + free( proc ); + } + + // Free name + if( IsHeap(Thread->ThreadName) ) + free(Thread->ThreadName); + + // Remove from global list + // TODO: Lock this too + if( Thread == gAllThreads ) + gAllThreads = Thread->GlobalNext; + else + Thread->GlobalPrev->GlobalNext = Thread->GlobalNext; + + free(Thread); +} + /** * \fn void Threads_SetName(const char *NewName) * \brief Sets the current thread's name @@ -140,9 +195,11 @@ int Threads_SetName(const char *NewName) cur->ThreadName = NULL; - if( IsHeap(oldname) ) free( oldname ); - + if( IsHeap(oldname) ) free( oldname ); cur->ThreadName = strdup(NewName); + + Log_Debug("Threads", "Thread renamed to '%s'", NewName); + return 0; } @@ -173,6 +230,7 @@ void Threads_SetPriority(tThread *Thread, int Pri) if(Thread == NULL) Thread = Proc_GetCurThread(); // Bounds checking // - If < 0, set to lowest priority + // - Minumum priority is actualy a high number, 0 is highest if(Pri < 0) Pri = MIN_PRIORITY; if(Pri > MIN_PRIORITY) Pri = MIN_PRIORITY; @@ -180,14 +238,18 @@ void Threads_SetPriority(tThread *Thread, int Pri) 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 ); + if( Thread != Proc_GetCurThread() ) + { + SHORTLOCK( &glThreadListLock ); + // Remove from old priority + Threads_int_DelFromQueue( &gaActiveThreads[Thread->Priority], Thread ); + // And add to new + Threads_int_AddToList( &gaActiveThreads[Pri], Thread ); + Thread->Priority = Pri; + SHORTREL( &glThreadListLock ); + } + else + Thread->Priority = Pri; #else // If this isn't the current thread, we need to lock if( Thread != Proc_GetCurThread() ) @@ -197,7 +259,9 @@ void Threads_SetPriority(tThread *Thread, int Pri) #if SCHEDULER_TYPE == SCHED_LOTTERY giFreeTickets -= caiTICKET_COUNTS[Thread->Priority] - caiTICKET_COUNTS[Pri]; # if DEBUG_TRACE_TICKETS - Log("Threads_SetTickets: new giFreeTickets = %i", giFreeTickets); + Log("Threads_SetTickets: new giFreeTickets = %i [-%i+%i]", + giFreeTickets, + caiTICKET_COUNTS[Thread->Priority], caiTICKET_COUNTS[Pri]); # endif #endif Thread->Priority = Pri; @@ -206,26 +270,26 @@ void Threads_SetPriority(tThread *Thread, int Pri) else Thread->Priority = Pri; #endif + + #if DEBUG_TRACE_STATE + Log("Threads_SetPriority: %p(%i %s) pri set %i", + Thread, Thread->TID, Thread->ThreadName, + Pri); + #endif } /** - * \fn tThread *Threads_CloneTCB(Uint *Err, Uint Flags) * \brief Clone the TCB of the current thread - * \param Err Error pointer * \param Flags Flags for something... (What is this for?) */ -tThread *Threads_CloneTCB(Uint *Err, Uint Flags) +tThread *Threads_CloneTCB(Uint Flags) { tThread *cur, *new; - int i; cur = Proc_GetCurThread(); // Allocate and duplicate new = malloc(sizeof(tThread)); - if(new == NULL) { - *Err = -ENOMEM; - return NULL; - } + if(new == NULL) { errno = -ENOMEM; return NULL; } memcpy(new, cur, sizeof(tThread)); new->CurCPU = -1; @@ -237,15 +301,36 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) // Get Thread ID new->TID = giNextTID++; new->Parent = cur; + new->bInstrTrace = 0; // Clone Name new->ThreadName = strdup(cur->ThreadName); // Set Thread Group ID (PID) - if(Flags & CLONE_VM) - new->TGID = new->TID; - else - new->TGID = cur->TGID; + if(Flags & CLONE_VM) { + tProcess *newproc, *oldproc; + oldproc = cur->Process; + new->Process = malloc( sizeof(struct sProcess) ); + newproc = new->Process; + newproc->PID = new->TID; + newproc->UID = oldproc->UID; + newproc->GID = oldproc->GID; + newproc->MaxFD = oldproc->MaxFD; + if( oldproc->CurrentWorkingDir ) + newproc->CurrentWorkingDir = strdup( oldproc->CurrentWorkingDir ); + else + newproc->CurrentWorkingDir = NULL; + if( oldproc->RootDir ) + newproc->RootDir = strdup( oldproc->RootDir ); + else + newproc->RootDir = NULL; + newproc->nThreads = 1; + // Reference all handles in the VFS + VFS_ReferenceUserHandles(); + } + else { + new->Process->nThreads ++; + } // Messages are not inherited new->Messages = NULL; @@ -254,27 +339,12 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) // Set State new->Remaining = new->Quantum = cur->Quantum; new->Priority = cur->Priority; + new->_errno = 0; // 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 @@ -287,18 +357,56 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) } /** - * \brief Get a configuration pointer from the Per-Thread data area - * \param ID Config slot ID - * \return Pointer at ID + * \brief Clone the TCB of the kernel thread */ -Uint *Threads_GetCfgPtr(int ID) +tThread *Threads_CloneThreadZero(void) { - if(ID < 0 || ID >= NUM_CFG_ENTRIES) { - Warning("Threads_GetCfgPtr: Index %i is out of bounds", ID); + tThread *new; + + // Allocate and duplicate + new = malloc(sizeof(tThread)); + if(new == NULL) { return NULL; } + memcpy(new, &gThreadZero, sizeof(tThread)); + + new->Process->nThreads ++; + + 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 = DEFAULT_QUANTUM; + new->Priority = DEFAULT_PRIORITY; + new->bInstrTrace = 0; + + // Set Signal Handlers + new->CurFaultNum = 0; + new->FaultHandler = 0; - return &Proc_GetCurThread()->Config[ID]; + // 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; } /** @@ -330,22 +438,17 @@ tTID Threads_WaitTID(int TID, int *Status) // Specific Thread if(TID > 0) { tThread *t = Threads_GetThread(TID); - int initStatus = t->Status; tTID ret; // Wait for the thread to die! - if(initStatus != THREAD_STAT_ZOMBIE) { - // TODO: Handle child also being suspended if wanted - while(t->Status != THREAD_STAT_ZOMBIE) { - Threads_Sleep(); - Log_Debug("Threads", "%i waiting for %i, t->Status = %i", - Threads_GetTID(), t->TID, t->Status); - } + // TODO: Handle child also being suspended if wanted + while(t->Status != THREAD_STAT_ZOMBIE) { + Threads_Sleep(); + Log_Debug("Threads", "%i waiting for %i, t->Status = %i", + Threads_GetTID(), t->TID, t->Status); } // Set return status - Log_Debug("Threads", "%i waiting for %i, t->Status = %i", - Threads_GetTID(), t->TID, t->Status); ret = t->TID; switch(t->Status) { @@ -355,7 +458,7 @@ tTID Threads_WaitTID(int TID, int *Status) // TODO: Child return value? if(Status) *Status = t->RetStatus; // add to delete queue - Threads_AddToDelete( t ); + Threads_Delete( t ); break; default: if(Status) *Status = -1; @@ -390,34 +493,17 @@ tThread *Threads_GetThread(Uint TID) return NULL; } -/** - * \brief Adds a thread to the delete queue - * \param Thread Thread to delete - */ -void Threads_AddToDelete(tThread *Thread) -{ - // Add to delete queue - // TODO: Is locking needed? - if(gDeleteThreads) { - Thread->Next = gDeleteThreads; - gDeleteThreads = Thread; - } else { - Thread->Next = NULL; - gDeleteThreads = Thread; - } -} - /** * \brief Deletes an entry from a list * \param List Pointer to the list head * \param Thread Thread to find * \return \a Thread */ -tThread *Threads_int_DelFromQueue(tThread **List, tThread *Thread) +tThread *Threads_int_DelFromQueue(tThreadList *List, tThread *Thread) { tThread *ret, *prev = NULL; - for(ret = *List; + for(ret = List->Head; ret && ret != Thread; prev = ret, ret = ret->Next ); @@ -429,17 +515,29 @@ tThread *Threads_int_DelFromQueue(tThread **List, tThread *Thread) } if( !prev ) { - *List = Thread->Next; + List->Head = Thread->Next; //LogF("%p(%s) removed from head of %p\n", Thread, Thread->ThreadName, List); } else { prev->Next = Thread->Next; //LogF("%p(%s) removed from %p (prev=%p)\n", Thread, Thread->ThreadName, List, prev); } + if( Thread->Next == NULL ) + List->Tail = prev; return Thread; } +void Threads_int_AddToList(tThreadList *List, tThread *Thread) +{ + if( List->Head ) + List->Tail->Next = Thread; + else + List->Head = Thread; + List->Tail = Thread; + Thread->Next = NULL; +} + /** * \brief Exit the current process (or another?) * \param TID Thread ID to kill @@ -465,18 +563,19 @@ void Threads_Exit(int TID, int Status) void Threads_Kill(tThread *Thread, int Status) { tMsg *msg; + int isCurThread = Thread == Proc_GetCurThread(); - // TODO: Kill all children + // TODO: Disown all children? #if 1 { tThread *child; - // TODO: I should keep a .Parent pointer, and a .Children list + // TODO: I should keep a .Children list for(child = gAllThreads; child; child = child->GlobalNext) { if(child->Parent == Thread) - Threads_Kill(child, -1); + child->Parent = &gThreadZero; } } #endif @@ -504,31 +603,35 @@ void Threads_Kill(tThread *Thread, int Status) // 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 + if( Thread != Proc_GetCurThread() ) { - // 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_RR_PRI + tThreadList *list = &gaActiveThreads[Thread->Priority]; + #else + tThreadList *list = &gActiveThreads; + #endif + if( Threads_int_DelFromQueue( list, Thread ) ) + { + } + else + { + Log_Warning("Threads", + "Threads_Kill - Thread %p(%i,%s) marked as active, but not on list", + Thread, Thread->TID, Thread->ThreadName + ); + } #if SCHEDULER_TYPE == SCHED_LOTTERY - if( Thread != Proc_GetCurThread() ) - giFreeTickets -= caiTICKET_COUNTS[ Thread->Priority ]; + 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 - ); - } + // Ensure that we are not rescheduled + Thread->Remaining = 0; // Clear Remaining Quantum + Thread->Quantum = 0; // Clear Quantum to indicate dead thread + + // Update bookkeeping + giNumActiveThreads --; break; + // Kill it while it sleeps! case THREAD_STAT_SLEEPING: if( !Threads_int_DelFromQueue( &gSleepingThreads, Thread ) ) { @@ -538,6 +641,15 @@ void Threads_Kill(tThread *Thread, int Status) ); } break; + + // Brains!... You cannot kill something that is already dead + 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); @@ -546,28 +658,21 @@ void Threads_Kill(tThread *Thread, int Status) // Save exit status Thread->RetStatus = Status; - - // Don't Zombie if we are being killed because our parent is - if(Status == -1) - { - Thread->Status = THREAD_STAT_DEAD; - Threads_AddToDelete( Thread ); - } else { - Thread->Status = THREAD_STAT_ZOMBIE; - // Wake parent - Threads_Wake( Thread->Parent ); - } + + SHORTREL( &Thread->IsLocked ); + + Thread->Status = THREAD_STAT_ZOMBIE; + SHORTREL( &glThreadListLock ); + // TODO: Send something like SIGCHLD + Threads_Wake( Thread->Parent ); 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(); + Proc_Reschedule(); } } @@ -576,10 +681,8 @@ void Threads_Kill(tThread *Thread, int Status) */ void Threads_Yield(void) { - tThread *thread = Proc_GetCurThread(); - thread->Remaining = 0; - //while(thread->Remaining == 0) - HALT(); +// Log("Threads_Yield: by %p", __builtin_return_address(0)); + Proc_Reschedule(); } /** @@ -605,9 +708,7 @@ void Threads_Sleep(void) cur->Status = THREAD_STAT_SLEEPING; // Add to Sleeping List (at the top) - cur->Next = gSleepingThreads; - gSleepingThreads = cur; - + Threads_int_AddToList( &gSleepingThreads, cur ); #if DEBUG_TRACE_STATE Log("Threads_Sleep: %p (%i %s) sleeping", cur, cur->TID, cur->ThreadName); @@ -615,13 +716,16 @@ void Threads_Sleep(void) // Release Spinlock SHORTREL( &glThreadListLock ); - - while(cur->Status != THREAD_STAT_ACTIVE) HALT(); + + while(cur->Status != THREAD_STAT_ACTIVE) { + Proc_Reschedule(); + if( cur->Status != THREAD_STAT_ACTIVE ) + Log("%i - Huh? why am I up? zzzz...", cur->TID); + } } /** - * \fn int Threads_Wake( tThread *Thread ) * \brief Wakes a sleeping/waiting thread up * \param Thread Thread to wake * \return Boolean Failure (Returns ERRNO) @@ -635,7 +739,7 @@ int Threads_Wake(tThread *Thread) 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: @@ -643,24 +747,73 @@ int Threads_Wake(tThread *Thread) // Remove from sleeping queue Threads_int_DelFromQueue(&gSleepingThreads, Thread); + SHORTREL( &glThreadListLock ); 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_SEMAPHORESLEEP: { + tSemaphore *sem; + tThread *th, *prev=NULL; + + sem = Thread->WaitPointer; + + SHORTLOCK( &sem->Protector ); + + // Remove from sleeping queue + for( th = sem->Waiting; th; prev = th, th = th->Next ) + if( th == Thread ) break; + if( th ) + { + if(prev) + prev->Next = Thread->Next; + else + sem->Waiting = Thread->Next; + if(sem->LastWaiting == Thread) + sem->LastWaiting = prev; + } + else + { + prev = NULL; + for( th = sem->Signaling; th; prev = th, th = th->Next ) + if( th == Thread ) break; + if( !th ) { + Log_Warning("Threads", "Thread %p(%i %s) is not on semaphore %p(%s:%s)", + Thread, Thread->TID, Thread->ThreadName, + sem, sem->ModName, sem->Name); + return -EINTERNAL; + } + + if(prev) + prev->Next = Thread->Next; + else + sem->Signaling = Thread->Next; + if(sem->LastSignaling == Thread) + sem->LastSignaling = prev; + } + + Thread->RetStatus = 0; // It didn't get anything + Threads_AddActive( Thread ); + + #if DEBUG_TRACE_STATE + Log("Threads_Sleep: %p(%i %s) woken from semaphore", Thread, Thread->TID, Thread->ThreadName); + #endif + SHORTREL( &sem->Protector ); + } 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; } } @@ -681,6 +834,13 @@ int Threads_WakeTID(tTID TID) return ret; } +void Threads_ToggleTrace(int TID) +{ + tThread *thread = Threads_GetThread(TID); + if(!thread) return ; + thread->bInstrTrace = !thread->bInstrTrace; +} + /** * \brief Adds a thread to the active queue */ @@ -690,31 +850,46 @@ void Threads_AddActive(tThread *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", + Log_Warning("Threads", "WTF, %p CPU%i %p (%i %s) is adding %p (%i %s) when it is active", + __builtin_return_address(0), GetCPUNum(), cur, cur->TID, cur->ThreadName, Thread, Thread->TID, Thread->ThreadName); + SHORTREL( &glThreadListLock ); + return ; } // Set state Thread->Status = THREAD_STAT_ACTIVE; - Thread->CurCPU = -1; +// 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 + { + #if SCHEDULER_TYPE == SCHED_RR_PRI + tThreadList *list = &gaActiveThreads[Thread->Priority]; + #else + tThreadList *list = &gActiveThreads; + #endif + Threads_int_AddToList( list, Thread ); + } // Update bookkeeping giNumActiveThreads ++; #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 + { + int delta; + // Only change the ticket count if the thread is un-scheduled + if(Thread->CurCPU != -1) + delta = 0; + else + delta = caiTICKET_COUNTS[ Thread->Priority ]; + + giFreeTickets += delta; + # if DEBUG_TRACE_TICKETS + Log("CPU%i %p (%i %s) added, new giFreeTickets = %i [+%i]", + GetCPUNum(), Thread, Thread->TID, Thread->ThreadName, + giFreeTickets, delta + ); + # endif + } #endif SHORTREL( &glThreadListLock ); @@ -722,14 +897,18 @@ void Threads_AddActive(tThread *Thread) /** * \brief Removes the current thread from the active queue - * \warning This should ONLY be called with task switches disabled + * \warning This should ONLY be called with the lock held * \return Current thread pointer */ tThread *Threads_RemActive(void) { + #if 0 tThread *ret = Proc_GetCurThread(); - - SHORTLOCK( &glThreadListLock ); + + if( !IS_LOCKED(&glThreadListLock) ) { + Log_KernelPanic("Threads", "Threads_RemActive called without lock held"); + return NULL; + } // Delete from active queue #if SCHEDULER_TYPE == SCHED_RR_PRI @@ -738,25 +917,27 @@ tThread *Threads_RemActive(void) if( !Threads_int_DelFromQueue(&gActiveThreads, ret) ) #endif { - SHORTREL( &glThreadListLock ); + Log_Warning("Threads", "Current thread %p(%i %s) is not on active queue", + ret, ret->TID, ret->ThreadName + ); return NULL; } ret->Next = NULL; ret->Remaining = 0; - ret->CurCPU = -1; 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", + Log("CPU%i %p (%i %s) removed, giFreeTickets = %i [nc]", GetCPUNum(), ret, ret->TID, ret->ThreadName, giFreeTickets); #endif - SHORTREL( &glThreadListLock ); - return ret; + #else + return Proc_GetCurThread(); + #endif } /** @@ -777,8 +958,6 @@ void Threads_Fault(int Num) { tThread *thread = Proc_GetCurThread(); - Log_Log("Threads", "Threads_Fault: thread = %p", thread); - if(!thread) return ; Log_Log("Threads", "Threads_Fault: thread->FaultHandler = %p", thread->FaultHandler); @@ -797,6 +976,7 @@ void Threads_Fault(int Num) // Double Fault? Oh, F**k if(thread->CurFaultNum != 0) { + Log_Warning("Threads", "Threads_Fault: Double fault on %i", thread->TID); Threads_Kill(thread, -1); // For now, just kill HALT(); } @@ -806,10 +986,24 @@ 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) +{ + tThread *cur = Proc_GetCurThread(); + cur->bInstrTrace = 0; + Log_Warning("Threads", "Thread #%i committed a segfault at address %p", cur->TID, Addr); + MM_DumpTables(0, USER_MAX); + Threads_Fault( 1 ); + //Threads_Exit( 0, -1 ); +} + // --- Process Structure Access Functions --- tPID Threads_GetPID(void) { - return Proc_GetCurThread()->TGID; + return Proc_GetCurThread()->Process->PID; } tTID Threads_GetTID(void) { @@ -817,43 +1011,65 @@ tTID Threads_GetTID(void) } tUID Threads_GetUID(void) { - return Proc_GetCurThread()->UID; + return Proc_GetCurThread()->Process->UID; } tGID Threads_GetGID(void) { - return Proc_GetCurThread()->GID; + return Proc_GetCurThread()->Process->GID; } -int Threads_SetUID(Uint *Errno, tUID ID) +int Threads_SetUID(tUID ID) { tThread *t = Proc_GetCurThread(); - if( t->UID != 0 ) { - *Errno = -EACCES; + if( t->Process->UID != 0 ) { + errno = -EACCES; return -1; } - Log_Debug("Threads", "TID %i's UID set to %i", t->TID, ID); - t->UID = ID; + Log_Debug("Threads", "PID %i's UID set to %i", t->Process->PID, ID); + t->Process->UID = ID; return 0; } -int Threads_SetGID(Uint *Errno, tGID ID) +int Threads_SetGID(tGID ID) { tThread *t = Proc_GetCurThread(); - if( t->UID != 0 ) { - *Errno = -EACCES; + if( t->Process->UID != 0 ) { + errno = -EACCES; return -1; } - Log_Debug("Threads", "TID %i's GID set to %i", t->TID, ID); - t->GID = ID; + Log_Debug("Threads", "PID %i's GID set to %i", t->Process->PID, ID); + t->Process->GID = ID; return 0; } +// --- Per-thread storage --- +int *Threads_GetErrno(void) +{ + return &Proc_GetCurThread()->_errno; +} + +// --- Configuration --- +int *Threads_GetMaxFD(void) +{ + return &Proc_GetCurThread()->Process->MaxFD; +} +char **Threads_GetChroot(void) +{ + return &Proc_GetCurThread()->Process->RootDir; +} +char **Threads_GetCWD(void) +{ + return &Proc_GetCurThread()->Process->CurrentWorkingDir; +} +// --- + /** * \fn void Threads_Dump(void) */ void Threads_DumpActive(void) { tThread *thread; + tThreadList *list; #if SCHEDULER_TYPE == SCHED_RR_PRI int i; #endif @@ -863,17 +1079,22 @@ void Threads_DumpActive(void) #if SCHEDULER_TYPE == SCHED_RR_PRI for( i = 0; i < MIN_PRIORITY+1; i++ ) { - for(thread=gaActiveThreads[i];thread;thread=thread->Next) + list = &gaActiveThreads[i]; #else - for(thread=gActiveThreads;thread;thread=thread->Next) + list = &gActiveThreads; #endif + for(thread=list->Head;thread;thread=thread->Next) { Log(" %p %i (%i) - %s (CPU %i)", - thread, thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); + thread, thread->TID, thread->Process->PID, thread->ThreadName, thread->CurCPU); if(thread->Status != THREAD_STAT_ACTIVE) - Log(" ERROR State (%i) != THREAD_STAT_ACTIVE (%i)", 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( thread->bInstrTrace ) + Log(" Tracing Enabled"); + Proc_DumpThreadCPUState(thread); } #if SCHEDULER_TYPE == SCHED_RR_PRI @@ -896,13 +1117,20 @@ void Threads_Dump(void) for(thread=gAllThreads;thread;thread=thread->GlobalNext) { Log(" %p %i (%i) - %s (CPU %i)", - thread, thread->TID, thread->TGID, thread->ThreadName, thread->CurCPU); + thread, thread->TID, thread->Process->PID, 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; @@ -910,6 +1138,9 @@ void Threads_Dump(void) } Log(" Priority %i, Quantum %i", thread->Priority, thread->Quantum); Log(" KStack 0x%x", thread->KernelStack); + if( thread->bInstrTrace ) + Log(" Tracing Enabled"); + Proc_DumpThreadCPUState(thread); } } @@ -930,33 +1161,12 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) 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 - while(gDeleteThreads) - { - thread = gDeleteThreads->Next; - // Only free if structure is unused - if( !IS_LOCKED(&gDeleteThreads->IsLocked) ) - { - // Set to dead - gDeleteThreads->Status = THREAD_STAT_BURIED; - // Free name - if( IsHeap(gDeleteThreads->ThreadName) ) - free(gDeleteThreads->ThreadName); - // Remove from global list - if( gDeleteThreads == gAllThreads ) - gAllThreads = gDeleteThreads->GlobalNext; - else - gDeleteThreads->GlobalPrev->GlobalNext = gDeleteThreads->GlobalNext; - free( gDeleteThreads ); - } - gDeleteThreads = thread; - } - + // Make sure the current (well, old) thread is marked as de-scheduled + if(Last) Last->CurCPU = -1; + // No active threads, just take a nap if(giNumActiveThreads == 0) { SHORTREL( &glThreadListLock ); @@ -965,36 +1175,48 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) #endif return NULL; } - + + #if 0 #if SCHEDULER_TYPE != SCHED_RR_PRI // Special case: 1 thread if(giNumActiveThreads == 1) { - if( gActiveThreads->CurCPU == -1 ) - gActiveThreads->CurCPU = CPU; + if( gActiveThreads.Head->CurCPU == -1 ) + gActiveThreads.Head->CurCPU = CPU; SHORTREL( &glThreadListLock ); - if( gActiveThreads->CurCPU == CPU ) - return gActiveThreads; + if( gActiveThreads.Head->CurCPU == CPU ) + return gActiveThreads.Head; return NULL; // CPU has nothing to do } #endif - + #endif + // Allow the old thread to be scheduled again if( Last ) { if( Last->Status == THREAD_STAT_ACTIVE ) { + tThreadList *list; #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); + LogF("Log: CPU%i released %p (%i %s) into the pool (%i [+%i] tickets in pool)\n", + CPU, Last, Last->TID, Last->ThreadName, giFreeTickets, + caiTICKET_COUNTS[ Last->Priority ]); # endif #endif + + #if SCHEDULER_TYPE == SCHED_RR_PRI + list = &gaActiveThreads[ Last->Priority ]; + #else + list = &gActiveThreads; + #endif + // Add to end of list + Threads_int_AddToList( list, Last ); } #if SCHEDULER_TYPE == SCHED_LOTTERY && DEBUG_TRACE_TICKETS else - LogF(" CPU %i released %p (%i %s)->Status = %i (Released)\n", + LogF("Log: CPU%i released %p (%i %s)->Status = %i (Released,not in pool)\n", CPU, Last, Last->TID, Last->ThreadName, Last->Status); #endif Last->CurCPU = -1; @@ -1008,8 +1230,8 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) int ticket, number; # if 1 number = 0; - for(thread = gActiveThreads; thread; thread = thread->Next) { - if(thread->CurCPU >= 0) continue; + for(thread = gActiveThreads.Head; thread; thread = thread->Next) + { 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); @@ -1035,9 +1257,8 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) ticket = number = rand() % giFreeTickets; // Find the next thread - for(thread=gActiveThreads;thread;thread=thread->Next) + for(thread = gActiveThreads.Head; thread; prev = thread, thread = thread->Next ) { - if(thread->CurCPU >= 0) continue; if( caiTICKET_COUNTS[ thread->Priority ] > number) break; number -= caiTICKET_COUNTS[ thread->Priority ]; } @@ -1053,12 +1274,21 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) Panic("Bookeeping Failed - giFreeTickets(%i) > true count (%i)", giFreeTickets, number); } + + // Remove + if(prev) + prev->Next = thread->Next; + else + gActiveThreads.Head = thread->Next; + if(!thread->Next) + gActiveThreads.Tail = prev; + + giFreeTickets -= caiTICKET_COUNTS[ thread->Priority ]; # 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); + LogF("Log: CPU%i allocated %p (%i %s), (%i [-%i] tickets in pool), \n", + CPU, thread, thread->TID, thread->ThreadName, + giFreeTickets, caiTICKET_COUNTS[ thread->Priority ]); # endif - - giFreeTickets -= caiTICKET_COUNTS[ thread->Priority ]; } // --- @@ -1067,28 +1297,20 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) #elif SCHEDULER_TYPE == SCHED_RR_PRI { int i; + thread = NULL; 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; + if( !gaActiveThreads[i].Head ) + continue ; + + thread = gaActiveThreads[i].Head; + + // Remove from head + gaActiveThreads[i].Head = thread->Next; + if(!thread->Next) + gaActiveThreads[i].Tail = NULL; + thread->Next = NULL; + break; } // Anything to do? @@ -1096,22 +1318,18 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) SHORTREL(&glThreadListLock); return NULL; } + if( thread->Status != THREAD_STAT_ACTIVE ) { + LogF("Oops, Thread %i (%s) is not active\n", thread->TID, thread->ThreadName); + } } #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; - } - } + { + // Get the next thread off the list + thread = gActiveThreads.Head; + gActiveThreads.Head = thread->Next; + if(!thread->Next) + gaActiveThreads.Tail = NULL; + thread->Next = NULL; // Anything to do? if( !thread ) { @@ -1125,218 +1343,13 @@ tThread *Threads_GetNextToRun(int CPU, tThread *Last) // Make the new thread non-schedulable thread->CurCPU = CPU; + thread->Remaining = thread->Quantum; 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 - * - * This type of mutex checks if the mutex is avaliable, and acquires it - * if it is. Otherwise, the current thread is added to the mutex's wait - * queue and the thread suspends. When the holder of the mutex completes, - * the oldest thread (top thread) on the queue is given the lock and - * restarted. - */ -void Mutex_Acquire(tMutex *Mutex) -{ - tThread *us = Proc_GetCurThread(); - - // Get protector - SHORTLOCK( &Mutex->Protector ); - - //Log("Mutex_Acquire: (%p)", Mutex); - - // Check if the lock is already held - if( Mutex->Owner ) { - SHORTLOCK( &glThreadListLock ); - // - Remove from active list - us = Threads_RemActive(); - us->Next = NULL; - // - Mark as sleeping - us->Status = THREAD_STAT_MUTEXSLEEP; - us->WaitPointer = Mutex; - - // - Add to waiting - if(Mutex->LastWaiting) { - Mutex->LastWaiting->Next = us; - Mutex->LastWaiting = us; - } - else { - 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_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 -} - -/** - * \brief Release a held mutex - * \param Mutex Mutex to release - */ -void Mutex_Release(tMutex *Mutex) -{ - SHORTLOCK( &Mutex->Protector ); - //Log("Mutex_Release: (%p)", 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 - 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 -} - -/** - * \brief Is this mutex locked? - * \param Mutex Mutex pointer - */ -int Mutex_IsLocked(tMutex *Mutex) -{ - return Mutex->Owner != NULL; -} - -/** - * \brief Initialise the semaphore - * \param Value Initial value of the semaphore - * \param Label Symbolic name - */ -void Semaphore_Init(tSemaphore *Sem, int Value, const char *Label) -{ - Sem->Value = Value; - Sem->Name = Label; -} - -/** - * \brief Acquire a "item" from the semaphore - */ -void Semaphore_Wait(tSemaphore *Sem) -{ - tThread *us; - - SHORTLOCK( &Sem->Protector ); - if( Sem->Value > 0 ) { - Sem->Value --; - SHORTREL( &Sem->Protector ); - return ; - } - - SHORTLOCK( &glThreadListLock ); - - // - Remove from active list - us = Threads_RemActive(); - us->Next = NULL; - // - Mark as sleeping - us->Status = THREAD_STAT_SEMAPHORESLEEP; - us->WaitPointer = Sem; - - // - 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_MUTEXSLEEP) Threads_Yield(); - // We're only woken when there's something avaliable - us->WaitPointer = NULL; -} - -/** - * \brief Add an "item" to the semaphore - */ -void Semaphore_Signal(tSemaphore *Sem) -{ - SHORTLOCK( &Sem->Protector ); - Sem->Value ++; - - if( Sem->Waiting ) - { - tThread *toWake = Sem->Waiting; - - Sem->Waiting = Sem->Waiting->Next; // Next! - // Reset ->LastWaiting to NULL if we have just removed the last waiting thread - if( Sem->Waiting == NULL ) - Sem->LastWaiting = NULL; - - // Wake new owner - SHORTLOCK( &glThreadListLock ); - if( toWake->Status != THREAD_STAT_ACTIVE ) - Threads_AddActive(toWake); - SHORTREL( &glThreadListLock ); - - // Decrement (the value is now "owned" by `toWake`) - Sem->Value --; - } - SHORTREL( &Sem->Protector ); -} - // === EXPORTS === EXPORT(Threads_GetUID); EXPORT(Threads_GetGID); -EXPORT(Mutex_Acquire); -EXPORT(Mutex_Release); -EXPORT(Mutex_IsLocked);