X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2Fthreads.c;h=a39fb5e453f6368106903e40f90c8081225a7304;hb=7dcbae6762b50bdd450559ca455f2374a09f1df9;hp=9d125178e4b7e21915668881d36c49bdc1dfd641;hpb=7f80ab30017689efe0aaaab18abc7ceda689d859;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/threads.c b/AcessNative/acesskernel_src/threads.c
index 9d125178..a39fb5e4 100644
--- a/AcessNative/acesskernel_src/threads.c
+++ b/AcessNative/acesskernel_src/threads.c
@@ -32,6 +32,15 @@ typedef struct sState
 }	tState;
 #endif
 
+typedef struct sProcess
+{
+	 int	nThreads;
+	 int	NativePID;
+	char	*CWD;
+	char	*Chroot;
+	 int	MaxFD;
+} tProcess;
+
 typedef struct sThread
 {
 	struct sThread	*GlobalNext;
@@ -48,9 +57,7 @@ typedef struct sThread
 
 	 int	State;	// 0: Dead, 1: Active, 2: Paused, 3: Asleep
 	 int	ExitStatus;
-	#if 0
-	tState	CurState;
-	#endif
+	 int	_errno;
 
 	// Threads waiting for this thread to exit.
 	// Quit logic:
@@ -61,23 +68,38 @@ typedef struct sThread
 	struct sThread	*WaitingThreads;
 	struct sThread	*WaitingThreadsEnd;
 
-	// Config?
-	Uint	Config[NUM_CFG_ENTRIES];
+	tProcess	*Process;	
+
+	Uint32	Events, WaitMask;
+	SDL_sem	*EventSem;
+
 }	tThread;
 
 // === PROTOTYPES ===
  int	Threads_Wake(tThread *Thread);
 
 // === GLOBALS ===
+tProcess gProcessZero = {
+	.NativePID = 0,
+	.CWD = "/",
+	.Chroot = "/",
+	.MaxFD = 100
+};
 tThread	gThreadZero = {
-	State: 1,
-	ThreadName: "ThreadZero"
+	.State=1,
+	.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;
@@ -92,6 +114,19 @@ void Threads_Dump(void)
 	}
 }
 
+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(int TID)
 {
 	tThread	*thread;
@@ -154,14 +189,10 @@ int Threads_SetGID(int *Errno, tGID NewGID)
 	return 0;
 }
 
-Uint *Threads_GetCfgPtr(int Index)
-{
-	if( Index < 0 || Index >= NUM_CFG_ENTRIES )
-		return NULL;
-	if( !gpCurrentThread )
-		return NULL;
-	return &gpCurrentThread->Config[Index];
-}
+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; };
 
 int Threads_WaitTID(int TID, int *Status)
 {
@@ -192,6 +223,7 @@ int Threads_WaitTID(int TID, int *Status)
 		
 		us->Next = NULL;
 		us->State = 3;
+		// TODO: Locking
 		if(thread->WaitingThreadsEnd)
 		{
 			thread->WaitingThreadsEnd->Next = us;
@@ -204,7 +236,10 @@ int Threads_WaitTID(int TID, int *Status)
 		}
 		
 		while(thread->State != 0)
+		{
 			pause();
+			Log_Debug("Threads", "Huh?... state = %i", thread->State);
+		}
 		
 		if(Status)	*Status = thread->ExitStatus;
 		thread->WaitingThreads = thread->WaitingThreads->Next;
@@ -232,15 +267,22 @@ void Threads_Exit(int TID, int Status)
 	tThread	*toWake;
 	
 //	VFS_Handles_Cleanup();
+
+	gpCurrentThread->ExitStatus = Status;
 	
 	#if 1
-	// Wait for the thread to be waited upon
-	while( gpCurrentThread->WaitingThreads == NULL )
-		SDL_Delay(10);
+	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)
@@ -250,6 +292,7 @@ void Threads_Exit(int TID, int Status)
 
 int Threads_Wake(tThread *Thread)
 {
+	Thread->State = 0;
 	kill( Thread->KernelTID, SIGUSR1 );
 	return 0;
 }
@@ -319,35 +362,23 @@ int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd)
 	return AmmountToAdd;
 }
 
-#if 0
-void Threads_Sleep()
+Uint32 Threads_WaitEvents(Uint32 Mask)
 {
-	gpCurrentThread->State = 3;
-	if( setjmp(&gpCurrentThread->CurState) == 0 ) {
-		// Return to user wait
-		// Hmm... maybe I should have a "kernel" thread for every "user" thread
-	}
-	else {
-		// Just woken up, return
-		return ;
-	}
+	Uint32	rv;
+	gpCurrentThread->WaitMask = Mask;
+	if( !(gpCurrentThread->Events & Mask) )
+		SDL_SemWait( gpCurrentThread->EventSem );
+	rv = gpCurrentThread->Events & Mask;
+	gpCurrentThread->Events &= ~Mask;
+	gpCurrentThread->WaitMask = -1;
+	return rv;
 }
 
-int SaveState(tState *To)
+void Threads_PostEvent(tThread *Thread, Uint32 Events)
 {
-	Uint	ip;
-	__asm__ __volatile__(
-		"call 1f;\n\t"
-		"1f:\n\t"
-		"pop %%eax"
-		: "=a" (ip)
-		: );
-	// If we just returned
-	if(!ip)	return 1;
-
-	To->IP = ip;
-	__asm__ __volatile__ ("mov %%esp, %1" : "=r"(To->SP));
-	__asm__ __volatile__ ("mov %%ebp, %1" : "=r"(To->BP));
+	Thread->Events |= Events;
+	
+	if( Thread->WaitMask & Events )
+		SDL_SemPost( gpCurrentThread->EventSem );
 }
-#endif