X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fsemaphore.c;h=d4ec73139c6831a19dd512d6643020f21a043986;hb=48f6d3ace33f15e2c46fb4c7a79f1f647e446e33;hp=24174735cf0837beefa66780fea95732203101ff;hpb=083c31409b9f25c96807ab8fef8ac79e8fe4cf9e;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/semaphore.c b/KernelLand/Kernel/semaphore.c
index 24174735..d4ec7313 100644
--- a/KernelLand/Kernel/semaphore.c
+++ b/KernelLand/Kernel/semaphore.c
@@ -5,6 +5,7 @@
  * semaphore.c
  * - Semaphores
  */
+#define DEBUG	0
 #include <acess.h>
 #include <semaphore.h>
 #include <threads_int.h>
@@ -17,6 +18,7 @@
 //
 void Semaphore_Init(tSemaphore *Sem, int Value, int MaxValue, const char *Module, const char *Name)
 {
+	LOG("Init %p to %i/%i (%s:%s)", Sem, Value, MaxValue, Module, Name);
 	memset(Sem, 0, sizeof(tSemaphore));
 	Sem->Value = Value;
 	Sem->ModName = Module;
@@ -28,15 +30,17 @@ void Semaphore_Init(tSemaphore *Sem, int Value, int MaxValue, const char *Module
 //
 int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
 {
-	tThread	*us;
 	 int	taken;
 	if( MaxToTake < 0 ) {
 		Log_Warning("Threads", "Semaphore_Wait: User bug - MaxToTake(%i) < 0, Sem=%p(%s)",
 			MaxToTake, Sem, Sem->Name);
 		MaxToTake = 0;
 	}
+	LOG("Waiting on %p for %i (%i/%i used atm) - (%s:%s)",
+		Sem, MaxToTake, Sem->Value, Sem->MaxValue, Sem->ModName, Sem->Name);
 	
 	SHORTLOCK( &Sem->Protector );
+	LOG("Protector grabbed");
 	
 	// Check if there's already items avaliable
 	if( Sem->Value > 0 )
@@ -50,43 +54,9 @@ int Semaphore_Wait(tSemaphore *Sem, int MaxToTake)
 	}
 	else
 	{
-		SHORTLOCK( &glThreadListLock );
-		
-		// - Remove from active list
-		us = Threads_RemActive();
-		us->Next = NULL;
-		// - Mark as sleeping
-		us->Status = THREAD_STAT_SEMAPHORESLEEP;
-		us->WaitPointer = Sem;
-		us->RetStatus = MaxToTake;	// Use RetStatus as a temp variable
-		
-		// - Add to waiting
-		if(Sem->LastWaiting) {
-			Sem->LastWaiting->Next = us;
-			Sem->LastWaiting = us;
-		}
-		else {
-			Sem->Waiting = us;
-			Sem->LastWaiting = us;
-		}
-		
-		#if DEBUG_TRACE_STATE || SEMAPHORE_DEBUG
-		Log("%p (%i %s) waiting on semaphore %p %s:%s",
-			us, us->TID, us->ThreadName,
-			Sem, Sem->ModName, Sem->Name);
-		#endif
-		
-		SHORTREL( &Sem->Protector );	// Release first to make sure it is released
-		SHORTREL( &glThreadListLock );
-		// Sleep until woken (either by getting what we need, or a timer event)
-		Threads_int_WaitForStatusEnd( THREAD_STAT_SEMAPHORESLEEP );
-		// We're only woken when there's something avaliable (or a signal arrives)
-		#if DEBUG_TRACE_STATE || SEMAPHORE_DEBUG
-		Log("Semaphore %p %s:%s woken", Sem, Sem->ModName, Sem->Name);
-		#endif
-		us->WaitPointer = NULL;
-		
-		taken = us->RetStatus;
+		taken = Threads_int_Sleep(THREAD_STAT_SEMAPHORESLEEP,
+			Sem, MaxToTake,
+			&Sem->Waiting, &Sem->LastWaiting, &Sem->Protector);
 		
 		// Get the lock again
 		SHORTLOCK( &Sem->Protector );
@@ -152,44 +122,13 @@ int Semaphore_Signal(tSemaphore *Sem, int AmmountToAdd)
 	// Check if we have to block
 	if( Sem->MaxValue && Sem->Value == Sem->MaxValue )
 	{
-		tThread	*us;
 		#if 0
 		Log_Debug("Threads", "Semaphore_Signal: IDLE Sem = %s:%s", Sem->ModName, Sem->Name);
 		Log_Debug("Threads", "Semaphore_Signal: Sem->Value(%i) == Sem->MaxValue(%i)", Sem->Value, Sem->MaxValue);
 		#endif
-		
-		SHORTLOCK( &glThreadListLock );
-		// - Remove from active list
-		us = Threads_RemActive();
-		us->Next = NULL;
-		// - Mark as sleeping
-		us->Status = THREAD_STAT_SEMAPHORESLEEP;
-		us->WaitPointer = Sem;
-		us->RetStatus = AmmountToAdd;	// Use RetStatus as a temp variable
-		
-		// - Add to waiting
-		if(Sem->LastSignaling) {
-			Sem->LastSignaling->Next = us;
-			Sem->LastSignaling = us;
-		}
-		else {
-			Sem->Signaling = us;
-			Sem->LastSignaling = us;
-		}
-		
-		#if DEBUG_TRACE_STATE || SEMAPHORE_DEBUG
-		Log("%p (%i %s) signaling semaphore %p %s:%s",
-			us, us->TID, us->ThreadName,
-			Sem, Sem->ModName, Sem->Name);
-		#endif
-		
-		SHORTREL( &glThreadListLock );	
-		SHORTREL( &Sem->Protector );
-		Threads_int_WaitForStatusEnd(THREAD_STAT_SEMAPHORESLEEP);
-		// We're only woken when there's something avaliable
-		us->WaitPointer = NULL;
-		
-		added = us->RetStatus;
+		added = Threads_int_Sleep(THREAD_STAT_SEMAPHORESLEEP,
+			Sem, AmmountToAdd,
+			&Sem->Signaling, &Sem->LastSignaling, &Sem->Protector);
 		
 		// Get the lock again
 		SHORTLOCK( &Sem->Protector );