* 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
+#define DEBUG 1
#include <arch.h>
-#undef NULL // Remove acess definition
#include <acess.h>
#include <mutex.h>
-#include <semaphore.h>
+#include "../../KernelLand/Kernel/include/semaphore.h"
+typedef signed long long int time_t;
+#include "../../Usermode/Libraries/ld-acess.so_src/include_exp/acess/syscall_types.h"
+#include <rwlock.h>
#include <events.h>
-
-#undef CLONE_VM // Such a hack
-#undef off_t
-
-// - Native headers
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include "/usr/include/signal.h"
-#include <SDL/SDL.h>
+#include <threads_int.h>
+#include <limits.h>
+#include "include/threads_glue.h"
+#include <stdbool.h>
#define THREAD_EVENT_WAKEUP 0x80000000
// === IMPORTS ===
-void VFS_CloneHandleList(int PID);
+extern void VFS_CloneHandleList(int PID);
+extern void VFS_CloneHandlesFromList(int PID, int nFD, int FDs[]);
+extern void VFS_ClearHandles(int PID);
// === STRUCTURES ===
-#if 0
-typedef struct sState
-{
- void *CurState;
- Uint SP, BP, IP;
-} tState;
-#endif
-
-typedef struct sProcess
-{
- int nThreads;
- int NativePID;
- char *CWD;
- char *Chroot;
- int MaxFD;
-} tProcess;
-
-typedef struct sThread
-{
- struct sThread *GlobalNext;
- struct sThread *Next;
-
- int KernelTID;
-
- tTID TID, PID;
- tUID UID, GID;
-
- struct sThread *Parent;
-
- char *ThreadName;
-
- int State; // 0: Dead, 1: Active, 2: Paused, 3: Asleep
- int ExitStatus;
- int _errno;
-
- // Threads waiting for this thread to exit.
- // Quit logic:
- // - Wait for `WaitingThreads` to be non-null (maybe?)
- // - Wake first in the queue, wait for it to be removed
- // - Repeat
- // - Free thread and quit kernel thread
- struct sThread *WaitingThreads;
- struct sThread *WaitingThreadsEnd;
-
- tProcess *Process;
-
- Uint32 Events, WaitMask;
- SDL_sem *EventSem;
-
-} tThread;
-
// === PROTOTYPES ===
int Threads_Wake(tThread *Thread);
.MaxFD = 100
};
tThread gThreadZero = {
- .State=1,
+ .Status=THREAD_STAT_ACTIVE,
.ThreadName="ThreadZero",
.Process = &gProcessZero
};
void Threads_Dump(void)
{
- tThread *thread;
- for( thread = gpThreads; thread; thread = thread->GlobalNext )
+ for( tThread *thread = gpThreads; thread; thread = thread->GlobalNext )
{
Log_Log("Threads", "TID %i (%s), PID %i",
- thread->TID, thread->ThreadName, thread->PID);
+ thread->TID, thread->ThreadName, thread->Process->PID);
Log_Log("Threads", "User: %i, Group: %i",
- thread->UID, thread->GID);
+ thread->Process->UID, thread->Process->GID);
Log_Log("Threads", "Kernel Thread ID: %i",
thread->KernelTID);
}
}
-void Threads_SetThread(int TID)
+void Threads_SetThread(int TID, void *Client)
{
- tThread *thread;
- for( thread = gpThreads; thread; thread = thread->GlobalNext )
+ for( tThread *thread = gpThreads; thread; thread = thread->GlobalNext )
{
if( thread->TID == TID ) {
gpCurrentThread = thread;
+ thread->ClientPtr = Client;
return ;
}
}
Log_Error("Threads", "_SetThread - Thread %i is not on global list", TID);
}
-tThread *Threads_GetThread(int TID)
+tThread *Threads_GetThread(Uint TID)
{
- tThread *thread;
- for( thread = gpThreads; thread; thread = thread->GlobalNext )
+ for( tThread *thread = gpThreads; thread; thread = thread->GlobalNext )
{
- if( thread->TID == TID )
+ if( thread->TID == TID ) {
return thread;
+ }
}
return NULL;
}
/**
* \brief Clone a thread control block (with a different TID)
*/
-tThread *Threads_CloneTCB(tThread *TemplateThread)
+tThread *Threads_CloneTCB(tThread *TemplateThread, bool bNewProcess)
{
tThread *ret = malloc(sizeof(tThread));
-
memcpy(ret, TemplateThread, sizeof(tThread));
ret->TID = giThreads_NextThreadID ++;
ret->ThreadName = strdup(TemplateThread->ThreadName);
- ret->EventSem = SDL_CreateSemaphore(0);
+ Threads_Glue_SemInit( &ret->EventSem, 0 );
ret->WaitingThreads = NULL;
ret->WaitingThreadsEnd = NULL;
-
+
+ if( bNewProcess )
+ {
+ tProcess *proc = malloc( sizeof(tProcess) );
+ memcpy(proc, ret->Process, sizeof(tProcess));
+ proc->nThreads = 0;
+ proc->CWD = strdup(proc->CWD);
+ proc->Chroot = strdup(proc->Chroot);
+
+ proc->PID = ret->TID;
+
+ ret->Process = proc;
+ }
+
+ ret->Process->nThreads ++;
+
// Add to the end of the queue
// TODO: Handle concurrency issues
ret->GlobalNext = gpThreads;
return ret;
}
-tUID Threads_GetUID() { return gpCurrentThread->UID; }
-tGID Threads_GetGID() { return gpCurrentThread->GID; }
+void Threads_int_Destroy(tThread *Thread)
+{
+ // Clear WaitingThreads
+
+ Threads_Glue_SemDestroy(Thread->EventSem);
+ free(Thread->ThreadName);
+ Thread->Process->nThreads --;
+}
+
+void Threads_Terminate(void)
+{
+ tThread *us = gpCurrentThread;
+ tProcess *proc = us->Process;
+
+ if( us->TID == proc->PID )
+ {
+ // If we're the process leader, then tear down the entire process
+ VFS_ClearHandles(proc->PID);
+ tThread **next_ptr = &gpThreads;
+ for( tThread *thread = gpThreads; thread; thread = *next_ptr )
+ {
+ if( thread->Process == proc ) {
+ Threads_int_Destroy(thread);
+ }
+ else {
+ next_ptr = &thread->Next;
+ }
+ }
+ }
+ else
+ {
+ // Just a lowly thread, remove from process
+ Threads_int_Destroy(us);
+ }
+
+ if( proc->nThreads == 0 )
+ {
+ free(proc->Chroot);
+ free(proc->CWD);
+ free(proc);
+ }
+}
+
+tUID Threads_GetUID() { return gpCurrentThread->Process->UID; }
+tGID Threads_GetGID() { return gpCurrentThread->Process->GID; }
tTID Threads_GetTID() { return gpCurrentThread->TID; }
-tPID Threads_GetPID() { return gpCurrentThread->PID; }
+tPID Threads_GetPID() { return gpCurrentThread->Process->PID; }
int Threads_SetUID(tUID NewUID)
{
return -1;
}
- gpCurrentThread->UID = NewUID;
+ gpCurrentThread->Process->UID = NewUID;
return 0;
}
return -1;
}
- gpCurrentThread->GID = NewGID;
+ gpCurrentThread->Process->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; };
+static tProcess *proc(tProcess *Proc) { return Proc ? Proc : gpCurrentThread->Process; }
+char **Threads_GetCWD (tProcess *Proc) { return &proc(Proc)->CWD; }
+char **Threads_GetChroot(tProcess *Proc) { return &proc(Proc)->Chroot; }
+int *Threads_GetMaxFD (tProcess *Proc) { return &proc(Proc)->MaxFD; };
tTID Threads_WaitTID(int TID, int *Status)
{
}
// Specific Thread
- if(TID > 0) {
-
+ if(TID > 0)
+ {
tThread *thread = Threads_GetThread(TID);
tThread *us = gpCurrentThread;
if(!thread) return -1;
us->Next = NULL;
- us->State = 3;
+ us->Status = THREAD_STAT_WAITING;
// TODO: Locking
if(thread->WaitingThreadsEnd)
{
Threads_WaitEvents( THREAD_EVENT_WAKEUP );
- if(Status) *Status = thread->ExitStatus;
+ if(Status) *Status = thread->RetStatus;
thread->WaitingThreads = thread->WaitingThreads->Next;
us->Next = NULL;
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;
+ gpCurrentThread->RetStatus = Status;
#if 1
if( gpCurrentThread->Parent )
{
// Wait for the thread to be waited upon
while( gpCurrentThread->WaitingThreads == NULL )
- SDL_Delay(10);
+ Threads_Glue_Yield();
}
#endif
Threads_Wake(toWake);
while(gpCurrentThread->WaitingThreads == toWake)
- SDL_Delay(10);
+ Threads_Glue_Yield();
}
}
+void Threads_Sleep()
+{
+ gpCurrentThread->Status = THREAD_STAT_SLEEPING;
+ Threads_int_WaitForStatusEnd(THREAD_STAT_SLEEPING);
+}
+
int Threads_Wake(tThread *Thread)
{
- Thread->State = 0;
+ Thread->Status = THREAD_STAT_ACTIVE;
Threads_PostEvent(Thread, THREAD_EVENT_WAKEUP);
return 0;
}
int Threads_CreateRootProcess(void)
{
- tThread *thread = Threads_CloneTCB(&gThreadZero);
- thread->PID = thread->TID;
+ tThread *thread = Threads_CloneTCB(&gThreadZero, true);
// Handle list is created on first open
- return thread->PID;
+ return thread->Process->PID;
}
int Threads_Fork(void)
{
- tThread *thread = Threads_CloneTCB(gpCurrentThread);
- thread->PID = thread->TID;
+ tThread *thread = Threads_CloneTCB(gpCurrentThread, true);
+
// Duplicate the VFS handles (and nodes) from vfs_handle.c
+ VFS_CloneHandleList(thread->Process->PID);
- VFS_CloneHandleList(thread->PID);
-
- return thread->PID;
+ return thread->Process->PID;
}
-int Mutex_Acquire(tMutex *Mutex)
+int Threads_Spawn(int nFD, int FDs[], struct s_sys_spawninfo *info)
{
- if(!Mutex->Protector.IsValid) {
- pthread_mutex_init( &Mutex->Protector.Mutex, NULL );
- Mutex->Protector.IsValid = 1;
+ tThread *thread = Threads_CloneTCB(gpCurrentThread, true);
+ if( info )
+ {
+ // TODO: PGID?
+ //if( info->flags & SPAWNFLAG_NEWPGID )
+ // thread->PGID = thread->PID;
+ if( thread->Process->UID == 0 )
+ {
+ if( info->gid )
+ thread->Process->GID = info->gid;
+ if( info->uid )
+ thread->Process->UID = info->uid;
+ }
}
- pthread_mutex_lock( &Mutex->Protector.Mutex );
- return 0;
+
+ VFS_CloneHandlesFromList(thread->Process->PID, nFD, FDs);
+
+ return thread->Process->PID;
}
-void Mutex_Release(tMutex *Mutex)
+// ----
+// ----
+void Threads_int_Terminate(tThread *Thread)
{
- pthread_mutex_unlock( &Mutex->Protector.Mutex );
+ Thread->RetStatus = -1;
+ Threads_AddActive(Thread);
}
-void Semaphore_Init(tSemaphore *Sem, int InitValue, int MaxValue, const char *Module, const char *Name)
+void Threads_int_WaitForStatusEnd(enum eThreadStatus Status)
{
- memset(Sem, 0, sizeof(tSemaphore));
- // HACK: Use `Sem->Protector` as space for the semaphore pointer
- *(void**)(&Sem->Protector) = SDL_CreateSemaphore(InitValue);
+ tThread *us = Proc_GetCurThread();
+ ASSERT(Status != THREAD_STAT_ACTIVE);
+ ASSERT(Status != THREAD_STAT_DEAD);
+ LOG("%i(%s) - %i", us->TID, us->ThreadName, Status);
+ while( us->Status == Status )
+ {
+ if( Threads_Glue_SemWait(gpCurrentThread->EventSem, INT_MAX) == -1 ) {
+ Log_Warning("Threads", "Wait on eventsem of %p, %p failed",
+ gpCurrentThread, gpCurrentThread->EventSem);
+ return ;
+ }
+ if( us->Status == Status )
+ Log_Warning("Threads", "Thread %p(%i %s) rescheduled while in %s state",
+ us, us->TID, us->ThreadName, casTHREAD_STAT[Status]);
+ }
}
-int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
+int Threads_int_Sleep(enum eThreadStatus Status, void *Ptr, int Num, tThread **ListHead, tThread **ListTail, tShortSpinlock *Lock)
{
- SDL_SemWait( *(void**)(&Sem->Protector) );
- return 1;
+ tThread *us = Proc_GetCurThread();
+ us->Next = NULL;
+ // - Mark as sleeping
+ us->Status = Status;
+ us->WaitPointer = Ptr;
+ us->RetStatus = Num; // Use RetStatus as a temp variable
+
+ // - Add to waiting
+ if( ListTail ) {
+ if(*ListTail) {
+ (*ListTail)->Next = us;
+ }
+ else {
+ *ListHead = us;
+ }
+ *ListTail = us;
+ }
+ else {
+ *ListHead = us;
+ }
+
+ if( Lock ) {
+ SHORTREL( Lock );
+ }
+ Threads_int_WaitForStatusEnd(Status);
+ us->WaitPointer = NULL;
+ return us->RetStatus;
}
-int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd)
+void Threads_AddActive(tThread *Thread)
{
- int i;
- for( i = 0; i < AmmountToAdd; i ++ )
- SDL_SemPost( *(void**)(&Sem->Protector) );
- return AmmountToAdd;
+ LOG("%i(%s)", Thread->TID, Thread->ThreadName);
+ Thread->Status = THREAD_STAT_ACTIVE;
+ Threads_Glue_SemSignal(Thread->EventSem, 1);
}
-Uint32 Threads_WaitEvents(Uint32 Mask)
+// --------------------------------------------------------------------
+// Signals
+// --------------------------------------------------------------------
+void Threads_PostSignal(int SigNum)
{
- 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;
+ Log_Error("Threads", "TODO: %s", __func__);
}
-
-void Threads_PostEvent(tThread *Thread, Uint32 Events)
+void Threads_SignalGroup(tPGID PGID, int SignalNum)
{
- 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);
- }
+ Log_Error("Threads", "TODO: %s", __func__);
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au