X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmessages.c;h=45b5dfa85178f462d1b1b4a7dedb8dd2b4ae3597;hb=9c61cf12758c0977ee1dc5791cba638fd3437ba6;hp=32e579b3a9d50704edd60cd35e08eb46a146b8db;hpb=a79ebcb3a2e206251f44e99376ec2ed6c2bacc63;p=tpg%2Facess2.git

diff --git a/Kernel/messages.c b/Kernel/messages.c
index 32e579b3..45b5dfa8 100644
--- a/Kernel/messages.c
+++ b/Kernel/messages.c
@@ -4,8 +4,12 @@
  */
 #include <acess.h>
 #include <threads.h>
+#include <threads_int.h>
 #include <errno.h>
 
+// === IMPORTS ===
+extern tShortSpinlock	glThreadListLock;
+
 // === CODE ===
 /**
  * \fn int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
@@ -34,10 +38,13 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 	if(!thread) {	return -1;	}
 	
 	// Get Spinlock
-	LOCK( &thread->IsLocked );
+	SHORTLOCK( &thread->IsLocked );
 	
 	// Check if thread is still alive
-	if(thread->Status == THREAD_STAT_DEAD)	return -1;
+	if(thread->Status == THREAD_STAT_DEAD) {
+		SHORTREL( &thread->IsLocked );
+		return -1;
+	}
 	
 	// Create message
 	msg = malloc( sizeof(tMsg)+Length );
@@ -55,9 +62,11 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 		thread->LastMessage = msg;
 	}
 	
-	RELEASE(&thread->IsLocked);
+	SHORTREL(&thread->IsLocked);
 	
+	SHORTLOCK(&glThreadListLock);
 	Threads_Wake( thread );
+	SHORTREL(&glThreadListLock);
 	
 	return 0;
 }
@@ -72,7 +81,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 {
 	 int	ret;
-	void *tmp;
+	void	*tmp;
 	tThread	*cur = Proc_GetCurThread();
 	
 	// Check if queue has any items
@@ -80,7 +89,7 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 		return 0;
 	}
 
-	LOCK( &cur->IsLocked );
+	SHORTLOCK( &cur->IsLocked );
 	
 	if(Source)
 		*Source = cur->Messages->Source;
@@ -88,7 +97,7 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 	// Get message length
 	if( !Buffer ) {
 		ret = cur->Messages->Length;
-		RELEASE( &cur->IsLocked );
+		SHORTREL( &cur->IsLocked );
 		return ret;
 	}
 	
@@ -98,7 +107,7 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 		if( !CheckMem( Buffer, cur->Messages->Length ) )
 		{
 			*Err = -EINVAL;
-			RELEASE( &cur->IsLocked );
+			SHORTREL( &cur->IsLocked );
 			return -1;
 		}
 		memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
@@ -106,11 +115,12 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 	ret = cur->Messages->Length;
 	
 	// Remove from list
-	tmp = cur->Messages->Next;
-	free( (void*)cur->Messages );
-	cur->Messages = tmp;
+	tmp = cur->Messages;
+	cur->Messages = cur->Messages->Next;
+	
+	SHORTREL( &cur->IsLocked );
 	
-	RELEASE( &cur->IsLocked );
+	free(tmp);	// Free outside of lock
 	
 	return ret;
 }