X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fthreads.c;h=ba0f430db5eb84de47ec034f929124dff89a7b0c;hb=30e30d7bc325852a8677819d11a47373b08d6271;hp=3be978928545eb90c14263daaedb788b5d70ae21;hpb=b6c3b3cf61caafbd91bbf3acc81995e472656a5b;p=tpg%2Facess2.git diff --git a/Kernel/threads.c b/Kernel/threads.c index 3be97892..ba0f430d 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -3,7 +3,7 @@ * threads.c * - Common Thread Control */ -#include +#include #include #include @@ -18,14 +18,15 @@ const enum eConfigTypes cCONFIG_TYPES[] = { }; // === IMPORTS === -extern void ArchThreads_Init(); -extern void Proc_Start(); -extern tThread *Proc_GetCurThread(); +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); // === PROTOTYPES === -void Threads_Init(); -void Threads_SetName(char *NewName); +void Threads_Init(void); + int Threads_SetName(char *NewName); char *Threads_GetName(int ID); void Threads_SetTickets(int Num); tThread *Threads_CloneTCB(Uint *Err, Uint Flags); @@ -35,15 +36,17 @@ void Threads_AddToDelete(tThread *Thread); tThread *Threads_int_GetPrev(tThread **List, tThread *Thread); void Threads_Exit(int TID, int Status); void Threads_Kill(tThread *Thread, int Status); -void Threads_Yield(); -void Threads_Sleep(); +void Threads_Yield(void); +void Threads_Sleep(void); void Threads_Wake(tThread *Thread); void Threads_AddActive(tThread *Thread); - int Threads_GetPID(); - int Threads_GetTID(); - int Threads_GetUID(); - int Threads_GetGID(); -void Threads_Dump(); + 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_SetGID(Uint *Errno, tUID ID); +void Threads_Dump(void); // === GLOBALS === // -- Core Thread -- @@ -60,7 +63,7 @@ tThread gThreadZero = { {0}, // Saved State {0}, // VM State - 0, {0}, {0}, // Signal State + 0, 0, // Current Fault, Fault Handler NULL, NULL, // Messages, Last Message DEFAULT_QUANTUM, DEFAULT_QUANTUM, // Quantum, Remaining @@ -69,7 +72,7 @@ tThread gThreadZero = { }; // -- Processes -- // --- Locks --- -volatile int giThreadListLock = 0; ///\note NEVER use a heap function while locked +tSpinlock glThreadListLock = 0; ///\note NEVER use a heap function while locked // --- Current State --- volatile int giNumActiveThreads = 0; volatile int giTotalTickets = 0; @@ -82,10 +85,10 @@ tThread *gDeleteThreads = NULL; // Threads to delete // === CODE === /** - * \fn void Threads_Init() + * \fn void Threads_Init(void) * \brief Initialse the thread list */ -void Threads_Init() +void Threads_Init(void) { ArchThreads_Init(); @@ -116,13 +119,14 @@ void Threads_Init() * \fn void Threads_SetName(char *NewName) * \brief Sets the current thread's name */ -void Threads_SetName(char *NewName) +int Threads_SetName(char *NewName) { tThread *cur = Proc_GetCurThread(); if( IsHeap(cur->ThreadName) ) free( cur->ThreadName ); cur->ThreadName = malloc(strlen(NewName)+1); strcpy(cur->ThreadName, NewName); + return 0; } /** @@ -147,12 +151,12 @@ void Threads_SetTickets(int Num) if(Num < 0) return; if(Num > MAX_TICKETS) Num = MAX_TICKETS; - LOCK( &giThreadListLock ); + LOCK( &glThreadListLock ); giTotalTickets -= cur->NumTickets; cur->NumTickets = Num; giTotalTickets += Num; //LOG("giTotalTickets = %i", giTotalTickets); - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); } /** @@ -169,6 +173,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) *Err = -ENOMEM; return NULL; } + memcpy(new, cur, sizeof(tThread)); new->Next = NULL; new->IsLocked = 0; @@ -180,8 +185,7 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) new->PTID = cur->TID; // Clone Name - new->ThreadName = malloc(strlen(cur->ThreadName)+1); - strcpy(new->ThreadName, cur->ThreadName); + new->ThreadName = strdup(cur->ThreadName); // Set Thread Group ID (PID) if(Flags & CLONE_VM) @@ -198,12 +202,8 @@ tThread *Threads_CloneTCB(Uint *Err, Uint Flags) new->NumTickets = cur->NumTickets; // Set Signal Handlers - new->CurSignal = 0; - if(Flags & CLONE_VM) - memset(new->SignalHandlers, 0, sizeof(new->SignalHandlers)); - else - memcpy(new->SignalHandlers, cur->SignalHandlers, sizeof(new->SignalHandlers)); - memset(&new->SignalState, 0, sizeof(tTaskState)); + new->CurFaultNum = 0; + new->FaultHandler = cur->FaultHandler; for( i = 0; i < NUM_CFG_ENTRIES; i ++ ) { @@ -266,10 +266,11 @@ int Threads_WaitTID(int TID, int *status) int initStatus = t->Status; int ret; - if(initStatus != THREAD_STAT_ZOMBIE) + if(initStatus != THREAD_STAT_ZOMBIE) { while(t->Status == initStatus) { Threads_Yield(); } + } ret = t->RetStatus; switch(t->Status) @@ -335,7 +336,7 @@ void Threads_AddToDelete(tThread *Thread) } /** - * \fn tThread *Threads_int_GetPrev(tThread *List, tThread *Thread) + * \fn tThread *Threads_int_GetPrev(tThread **List, tThread *Thread) * \brief Gets the previous entry in a thead linked list */ tThread *Threads_int_GetPrev(tThread **List, tThread *Thread) @@ -373,7 +374,8 @@ void Threads_Exit(int TID, int Status) /** * \fn void Threads_Kill(tThread *Thread, int Status) * \brief Kill a thread - * \param TID Thread ID (0 for current) + * \param Thread Thread to kill + * \param Status Status code to return to the parent */ void Threads_Kill(tThread *Thread, int Status) { @@ -400,7 +402,7 @@ void Threads_Kill(tThread *Thread, int Status) LOCK( &Thread->IsLocked ); // Lock thread list - LOCK( &giThreadListLock ); + LOCK( &glThreadListLock ); // Get previous thread on list prev = Threads_int_GetPrev( &gActiveThreads, Thread ); @@ -438,7 +440,7 @@ void Threads_Kill(tThread *Thread, int Status) // Release spinlocks RELEASE( &Thread->IsLocked ); // Released first so that it IS released - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); //Log("Thread %i went *hurk*", Thread->TID); @@ -446,28 +448,28 @@ void Threads_Kill(tThread *Thread, int Status) } /** - * \fn void Threads_Yield() + * \fn void Threads_Yield(void) * \brief Yield remainder of timeslice */ -void Threads_Yield() +void Threads_Yield(void) { Proc_GetCurThread()->Remaining = 0; HALT(); } /** - * \fn void Threads_Sleep() + * \fn void Threads_Sleep(void) * \brief Take the current process off the run queue */ -void Threads_Sleep() +void Threads_Sleep(void) { tThread *cur = Proc_GetCurThread(); tThread *thread; - Log("Proc_Sleep: %i going to sleep", cur->TID); + //Log_Log("Threads", "%i going to sleep", cur->TID); // Acquire Spinlock - LOCK( &giThreadListLock ); + LOCK( &glThreadListLock ); // Get thread before current thread thread = Threads_int_GetPrev( &gActiveThreads, cur ); @@ -479,7 +481,7 @@ void Threads_Sleep() // Don't sleep if there is a message waiting if( cur->Messages ) { - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); return; } @@ -501,7 +503,7 @@ void Threads_Sleep() cur->Status = THREAD_STAT_SLEEPING; // Release Spinlock - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); while(cur->Status != THREAD_STAT_ACTIVE) HALT(); } @@ -518,13 +520,16 @@ void Threads_Wake(tThread *Thread) { case THREAD_STAT_ACTIVE: break; case THREAD_STAT_SLEEPING: - LOCK( &giThreadListLock ); + //Log_Log("Threads", "Waking %i (%p) from sleeping", Thread->TID, Thread); + LOCK( &glThreadListLock ); prev = Threads_int_GetPrev(&gSleepingThreads, Thread); prev->Next = Thread->Next; // Remove from sleeping queue Thread->Next = gActiveThreads; // Add to active queue gActiveThreads = Thread; + giNumActiveThreads ++; + giTotalTickets += Thread->NumTickets; Thread->Status = THREAD_STAT_ACTIVE; - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); break; case THREAD_STAT_WAITING: Warning("Thread_Wake - Waiting threads are not currently supported"); @@ -538,97 +543,121 @@ void Threads_Wake(tThread *Thread) } } +void Threads_WakeTID(tTID Thread) +{ + Threads_Wake( Threads_GetThread(Thread) ); +} + /** * \fn void Threads_AddActive(tThread *Thread) * \brief Adds a thread to the active queue */ void Threads_AddActive(tThread *Thread) { - LOCK( &giThreadListLock ); + LOCK( &glThreadListLock ); Thread->Next = gActiveThreads; gActiveThreads = Thread; giNumActiveThreads ++; giTotalTickets += Thread->NumTickets; //Log("Threads_AddActive: giNumActiveThreads = %i, giTotalTickets = %i", // giNumActiveThreads, giTotalTickets); - RELEASE( &giThreadListLock ); + RELEASE( &glThreadListLock ); } -#if 0 /** - * \fn void Threads_SetSignalHandler(int Num, void *Handler) + * \fn void Threads_SetFaultHandler(Uint Handler) * \brief Sets the signal handler for a signal */ -void Threads_SetSignalHandler(int Num, void *Handler) -{ - if(Num < 0 || Num >= NSIG) return; - - gCurrentThread->SignalHandlers[Num] = Handler; +void Threads_SetFaultHandler(Uint Handler) +{ + Log_Log("Threads", "Threads_SetFaultHandler: Handler = %p", Handler); + Proc_GetCurThread()->FaultHandler = Handler; } /** - * \fn void Threads_SendSignal(int TID, int Num) - * \brief Send a signal to a thread + * \fn void Threads_Fault(int Num) + * \brief Calls a fault handler */ -void Threads_SendSignal(int TID, int Num) +void Threads_Fault(int Num) { - tThread *thread = Proc_GetThread(TID); - void *handler; + tThread *thread = Proc_GetCurThread(); + + Log_Log("Threads", "Threads_Fault: thread = %p", thread); if(!thread) return ; - handler = thread->SignalHandlers[Num]; + Log_Log("Threads", "Threads_Fault: thread->FaultHandler = %p", thread->FaultHandler); - // Panic? - if(handler == SIG_ERR) { - Proc_Kill(TID); + switch(thread->FaultHandler) + { + case 0: // Panic? + Threads_Kill(thread, -1); + HALT(); return ; - } - // Dump Core? - if(handler == -2) { - Proc_Kill(TID); + case 1: // Dump Core? + Threads_Kill(thread, -1); + HALT(); return ; } - // Ignore? - if(handler == -2) return; - - // Check the type and handle if the thread is already in a signal - if(thread->CurSignal != 0) { - if(Num < _SIGTYPE_FATAL) - Proc_Kill(TID); - } else { - while(thread->CurSignal != 0) - Proc_Yield(); - } + + // Double Fault? Oh, F**k + if(thread->CurFaultNum != 0) { + Threads_Kill(thread, -1); // For now, just kill + HALT(); } - //TODO: + thread->CurFaultNum = Num; + + Proc_CallFaultHandler(thread); } -#endif // --- Process Structure Access Functions --- -int Threads_GetPID() +tPID Threads_GetPID(void) { return Proc_GetCurThread()->TGID; } -int Threads_GetTID() +tTID Threads_GetTID(void) { return Proc_GetCurThread()->TID; } -int Threads_GetUID() +tUID Threads_GetUID(void) { return Proc_GetCurThread()->UID; } -int Threads_GetGID() +tGID Threads_GetGID(void) { return Proc_GetCurThread()->GID; } +int Threads_SetUID(Uint *Errno, tUID ID) +{ + tThread *t = Proc_GetCurThread(); + if( t->UID != 0 ) { + *Errno = -EACCES; + return -1; + } + Log("Threads_SetUID - Setting User ID to %i", ID); + t->UID = ID; + return 0; +} + +int Threads_SetGID(Uint *Errno, tGID ID) +{ + tThread *t = Proc_GetCurThread(); + if( t->UID != 0 ) { + *Errno = -EACCES; + return -1; + } + Log("Threads_SetGID - Setting Group ID to %i", ID); + t->GID = ID; + return 0; +} + /** - * \fn void Threads_Dump() + * \fn void Threads_Dump(void) * \brief Dums a list of currently running threads */ -void Threads_Dump() +void Threads_Dump(void) { tThread *thread; tThread *cur = Proc_GetCurThread(); @@ -663,20 +692,18 @@ tThread *Threads_GetNextToRun(int CPU) int ticket; int number; - if(giNumActiveThreads == 0) return NULL; + if(giNumActiveThreads == 0) { + return NULL; + } // Special case: 1 thread if(giNumActiveThreads == 1) { return gActiveThreads; } - //Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i", - // giNumActiveThreads, giTotalTickets); // Get the ticket number ticket = number = rand() % giTotalTickets; - //Log(" Threads_GetNextToRun: ticket = %i", ticket); - // Find the next thread for(thread=gActiveThreads;thread;thread=thread->Next) { @@ -703,7 +730,10 @@ tThread *Threads_GetNextToRun(int CPU) */ void Threads_SegFault(tVAddr Addr) { - //Threads_SendSignal( Proc_GetCurThread()->TID, SIGSEGV ); Warning("Thread #%i committed a segfault at address %p", Proc_GetCurThread()->TID, Addr); - Threads_Exit( 0, -1 ); + Threads_Fault( 1 ); + //Threads_Exit( 0, -1 ); } + +// === EXPORTS === +EXPORT(Threads_GetUID);