X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fthreads.c;h=c390a031e9e72d8350fa85ca46f96134714f746a;hb=8c3572edcb27522e626c2629871857323169998d;hp=f7e1cb838ff46d1d8f952d5592419789f0023953;hpb=4e949acb1c98bc071af2d5d9038b4a3e703bf33d;p=tpg%2Facess2.git diff --git a/AcessNative/acesskernel_src/threads.c b/AcessNative/acesskernel_src/threads.c index f7e1cb83..c390a031 100644 --- a/AcessNative/acesskernel_src/threads.c +++ b/AcessNative/acesskernel_src/threads.c @@ -5,34 +5,368 @@ * threads.c * - Thread and process handling */ +#define _SIGNAL_H_ // Stop the acess signal.h being used +#define _HEAP_H_ // Stop heap.h being imported (collides with stdlib heap) +#define _VFS_EXT_H // Stop vfs_ext.h being imported (collides with fd_set) + +#define off_t _acess_off_t +#include +#undef NULL // Remove acess definition #include +#include +#include +#include +#include -// === STRUCTURES === -typedef struct sThread -{ - struct sThread *Next; - tTID TID, PID; - tUID UID, GID; +#undef CLONE_VM // Such a hack +#undef off_t + +// - Native headers +#include +#include +#include +#include "/usr/include/signal.h" +#include + +#define THREAD_EVENT_WAKEUP 0x80000000 - struct sThread *Parent; +// === IMPORTS === +void VFS_CloneHandleList(int PID); - char *ThreadName; +// === STRUCTURES === +#if 0 +typedef struct sState +{ + void *CurState; + Uint SP, BP, IP; +} tState; +#endif - // Config? - Uint Config[NUM_CFG_ENTRIES]; -} tThread; +// === PROTOTYPES === + int Threads_Wake(tThread *Thread); // === GLOBALS === -tThread *gpThreads; -__thread tThread *gpCurrentThread; +tProcess gProcessZero = { + .NativePID = 0, + .CWD = "/", + .Chroot = "/", + .MaxFD = 100 +}; +tThread gThreadZero = { + .Status=THREAD_STAT_ACTIVE, + .ThreadName="ThreadZero", + .Process = &gProcessZero +}; +tThread *gpThreads = &gThreadZero; +__thread tThread *gpCurrentThread = &gThreadZero; + int giThreads_NextThreadID = 1; // === CODE === +tThread *Proc_GetCurThread(void) +{ + return gpCurrentThread; +} + +void Threads_Dump(void) +{ + tThread *thread; + for( thread = gpThreads; thread; thread = thread->GlobalNext ) + { + Log_Log("Threads", "TID %i (%s), PID %i", + thread->TID, thread->ThreadName, thread->PID); + Log_Log("Threads", "User: %i, Group: %i", + thread->UID, thread->GID); + Log_Log("Threads", "Kernel Thread ID: %i", + thread->KernelTID); + } +} + +void Threads_SetThread(int TID) +{ + tThread *thread; + for( thread = gpThreads; thread; thread = thread->GlobalNext ) + { + if( thread->TID == TID ) { + gpCurrentThread = thread; + return ; + } + } + Log_Error("Threads", "_SetThread - Thread %i is not on global list", TID); +} + +tThread *Threads_GetThread(Uint TID) +{ + tThread *thread; + for( thread = gpThreads; thread; thread = thread->GlobalNext ) + { + if( thread->TID == TID ) { + return thread; + } + } + return NULL; +} + +/** + * \brief Clone a thread control block (with a different TID) + */ +tThread *Threads_CloneTCB(tThread *TemplateThread) +{ + tThread *ret = malloc(sizeof(tThread)); + + memcpy(ret, TemplateThread, sizeof(tThread)); + + ret->TID = giThreads_NextThreadID ++; + + ret->ThreadName = strdup(TemplateThread->ThreadName); + ret->EventSem = SDL_CreateSemaphore(0); + + ret->WaitingThreads = NULL; + ret->WaitingThreadsEnd = NULL; + + // Add to the end of the queue + // TODO: Handle concurrency issues + ret->GlobalNext = gpThreads; + gpThreads = ret; + + return ret; +} + tUID Threads_GetUID() { return gpCurrentThread->UID; } tGID Threads_GetGID() { return gpCurrentThread->GID; } tTID Threads_GetTID() { return gpCurrentThread->TID; } tPID Threads_GetPID() { return gpCurrentThread->PID; } -Uint *Threads_GetCfgPtr(int Index) +int Threads_SetUID(tUID NewUID) +{ + if(Threads_GetUID() != 0) { + errno = EACCES; + return -1; + } + + gpCurrentThread->UID = NewUID; + return 0; +} + +int Threads_SetGID(tGID NewGID) +{ + if(Threads_GetUID() != 0) { + errno = -EACCES; + return -1; + } + + gpCurrentThread->GID = NewGID; + return 0; +} + +int *Threads_GetErrno(void) { return &gpCurrentThread->_errno; } +char **Threads_GetCWD(void) { return &gpCurrentThread->Process->CWD; } +char **Threads_GetChroot(void) { return &gpCurrentThread->Process->Chroot; } +int *Threads_GetMaxFD(void) { return &gpCurrentThread->Process->MaxFD; }; + +tTID Threads_WaitTID(int TID, int *Status) +{ + // Any Child + if(TID == -1) { + Log_Error("Threads", "TODO: Threads_WaitTID(TID=-1) - Any Child"); + return -1; + } + + // Any peer/child thread + if(TID == 0) { + Log_Error("Threads", "TODO: Threads_WaitTID(TID=0) - Any Child/Sibling"); + return -1; + } + + // TGID = abs(TID) + if(TID < -1) { + Log_Error("Threads", "TODO: Threads_WaitTID(TID<0) - TGID"); + return -1; + } + + // Specific Thread + if(TID > 0) { + + tThread *thread = Threads_GetThread(TID); + tThread *us = gpCurrentThread; + if(!thread) return -1; + + us->Next = NULL; + us->Status = THREAD_STAT_WAITING; + // TODO: Locking + if(thread->WaitingThreadsEnd) + { + thread->WaitingThreadsEnd->Next = us; + thread->WaitingThreadsEnd = us; + } + else + { + thread->WaitingThreads = us; + thread->WaitingThreadsEnd = us; + } + + Threads_WaitEvents( THREAD_EVENT_WAKEUP ); + + if(Status) *Status = thread->ExitStatus; + thread->WaitingThreads = thread->WaitingThreads->Next; + us->Next = NULL; + + return TID; + } + + return 0; +} + +void Threads_Sleep(void) +{ + // TODO: Add to a sleeping queue + pause(); +} + +void Threads_Yield(void) +{ +// yield(); +} + +void Threads_Exit(int TID, int Status) +{ + tThread *toWake; + +// VFS_Handles_Cleanup(); + + gpCurrentThread->ExitStatus = Status; + + #if 1 + if( gpCurrentThread->Parent ) + { + // Wait for the thread to be waited upon + while( gpCurrentThread->WaitingThreads == NULL ) + SDL_Delay(10); + } + #endif + + while( (toWake = gpCurrentThread->WaitingThreads) ) + { + Log_Debug("Threads", "Threads_Exit - Waking %p %i '%s'", toWake, toWake->TID, toWake->ThreadName); + + Threads_Wake(toWake); + + while(gpCurrentThread->WaitingThreads == toWake) + SDL_Delay(10); + } +} + +int Threads_Wake(tThread *Thread) +{ + Thread->Status = THREAD_STAT_ACTIVE; + Threads_PostEvent(Thread, THREAD_EVENT_WAKEUP); + return 0; +} + +int Threads_WakeTID(tTID TID) +{ + tThread *thread; + thread = Threads_GetThread(TID); + if( !thread ) return -1; + return Threads_Wake(thread); +} + +int Threads_CreateRootProcess(void) +{ + tThread *thread = Threads_CloneTCB(&gThreadZero); + thread->PID = thread->TID; + + // Handle list is created on first open + + return thread->PID; +} + +int Threads_Fork(void) +{ + tThread *thread = Threads_CloneTCB(gpCurrentThread); + thread->PID = thread->TID; + // Duplicate the VFS handles (and nodes) from vfs_handle.c + + VFS_CloneHandleList(thread->PID); + + return thread->PID; +} + +// -------------------------------------------------------------------- +// Mutexes +// -------------------------------------------------------------------- +int Mutex_Acquire(tMutex *Mutex) +{ + if(!Mutex->Protector.IsValid) { + pthread_mutex_init( &Mutex->Protector.Mutex, NULL ); + Mutex->Protector.IsValid = 1; + } + pthread_mutex_lock( &Mutex->Protector.Mutex ); + return 0; +} + +void Mutex_Release(tMutex *Mutex) +{ + pthread_mutex_unlock( &Mutex->Protector.Mutex ); +} + +// -------------------------------------------------------------------- +// Semaphores +// -------------------------------------------------------------------- +void Semaphore_Init(tSemaphore *Sem, int InitValue, int MaxValue, const char *Module, const char *Name) +{ + memset(Sem, 0, sizeof(tSemaphore)); + // HACK: Use `Sem->Protector` as space for the semaphore pointer + *(void**)(&Sem->Protector) = SDL_CreateSemaphore(InitValue); +} + +int Semaphore_Wait(tSemaphore *Sem, int MaxToTake) +{ + SDL_SemWait( *(void**)(&Sem->Protector) ); + return 1; +} + +int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd) +{ + int i; + for( i = 0; i < AmmountToAdd; i ++ ) + SDL_SemPost( *(void**)(&Sem->Protector) ); + return AmmountToAdd; +} + +// -------------------------------------------------------------------- +// Event handling +// -------------------------------------------------------------------- +Uint32 Threads_WaitEvents(Uint32 Mask) +{ + Uint32 rv; + + Log_Debug("Threads", "Mask = %x, ->Events = %x", Mask, gpCurrentThread->Events); + + gpCurrentThread->WaitMask = Mask; + if( !(gpCurrentThread->Events & Mask) ) + { + SDL_SemWait( gpCurrentThread->EventSem ); + } + rv = gpCurrentThread->Events & Mask; + gpCurrentThread->Events &= ~Mask; + gpCurrentThread->WaitMask = -1; + + return rv; +} + +void Threads_PostEvent(tThread *Thread, Uint32 Events) { - return &gpCurrentThread->Config[Index]; + Thread->Events |= Events; + Log_Debug("Threads", "Trigger event %x (->Events = %p)", Events, Thread->Events); + + if( Thread->WaitMask & Events ) { + SDL_SemPost( Thread->EventSem ); +// Log_Debug("Threads", "Waking %p(%i %s)", Thread, Thread->TID, Thread->ThreadName); + } } + +void Threads_ClearEvent(Uint32 EventMask) +{ + gpCurrentThread->Events &= ~EventMask; +} +