* messages.c
*/
#include <acess.h>
-#include <proc.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)
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 );
thread->LastMessage = msg;
}
- RELEASE(&thread->IsLocked);
+ SHORTREL(&thread->IsLocked);
+ SHORTLOCK(&glThreadListLock);
Threads_Wake( thread );
+ SHORTREL(&glThreadListLock);
return 0;
}
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
return 0;
}
- LOCK( &cur->IsLocked );
+ SHORTLOCK( &cur->IsLocked );
if(Source)
*Source = cur->Messages->Source;
// Get message length
if( !Buffer ) {
ret = cur->Messages->Length;
- RELEASE( &cur->IsLocked );
+ SHORTREL( &cur->IsLocked );
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
+ {
+ if( !CheckMem( Buffer, cur->Messages->Length ) )
+ {
+ *Err = -EINVAL;
+ SHORTREL( &cur->IsLocked );
+ return -1;
+ }
memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
+ }
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;
}