git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AcessNative - Fixing for recent kernel changes
[tpg/acess2.git]
/
Kernel
/
messages.c
diff --git
a/Kernel/messages.c
b/Kernel/messages.c
index
057f997
..
afdcdbd
100644
(file)
--- a/
Kernel/messages.c
+++ b/
Kernel/messages.c
@@
-1,43
+1,54
@@
/*
/*
- * AcessOS Microkernel Version
+ * Acess2 Kernel
+ * - By John Hodge (thePowersGang)
+ *
* messages.c
* messages.c
+ * - IPC Messages
*/
*/
-#include <common.h>
-#include <proc.h>
+#define DEBUG 0
+#include <acess.h>
+#include <threads.h>
+#include <threads_int.h>
#include <errno.h>
#include <errno.h>
+#include <events.h>
// === CODE ===
/**
// === CODE ===
/**
- * \fn int Proc_SendMessage(Uint
*Err, Uint
Dest, int Length, void *Data)
+ * \fn int Proc_SendMessage(Uint Dest, int Length, void *Data)
* \brief Send an IPC message
* \brief Send an IPC message
- * \param Err Pointer to the errno variable
* \param Dest Destination Thread
* \param Length Length of the message
* \param Data Message data
*/
* \param Dest Destination Thread
* \param Length Length of the message
* \param Data Message data
*/
-int Proc_SendMessage(Uint
*Err, Uint
Dest, int Length, void *Data)
+int Proc_SendMessage(Uint Dest, int Length, void *Data)
{
tThread *thread;
tMsg *msg;
{
tThread *thread;
tMsg *msg;
-
Log("Proc_SendMessage: (Err=%p, Dest=%i, Length=%i, Data=%p)
", Err, Dest, Length, Data);
+
ENTER("pErr iDest iLength pData
", Err, Dest, Length, Data);
if(Length <= 0 || !Data) {
if(Length <= 0 || !Data) {
-
*Err
= -EINVAL;
-
return -1
;
+
errno
= -EINVAL;
+
LEAVE_RET('i', -1)
;
}
}
+ // TODO: Check message length against global/per-thread maximums
+ // TODO: Restrict queue length
+
// Get thread
thread = Threads_GetThread( Dest );
// Error check
// Get thread
thread = Threads_GetThread( Dest );
// Error check
- if(!thread)
{ return -1; }
+ if(!thread)
LEAVE_RET('i', -1);
// Get Spinlock
// Get Spinlock
- LOCK( &thread->IsLocked );
+
SHORT
LOCK( &thread->IsLocked );
// Check if thread is still alive
// Check if thread is still alive
- if(thread->Status == THREAD_STAT_DEAD) return -1;
+ if(thread->Status == THREAD_STAT_DEAD) {
+ SHORTREL( &thread->IsLocked );
+ LEAVE_RET('i', -1);
+ }
// Create message
msg = malloc( sizeof(tMsg)+Length );
// Create message
msg = malloc( sizeof(tMsg)+Length );
@@
-55,54
+66,76
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
thread->LastMessage = msg;
}
thread->LastMessage = msg;
}
- RELEASE(&thread->IsLocked);
-
- Threads_Wake( thread );
+ SHORTREL(&thread->IsLocked);
+
+ // Wake the thread
+ LOG("Waking %p (%i %s)", thread, thread->TID, thread->ThreadName);
+ Threads_PostEvent( thread, THREAD_EVENT_IPCMSG );
-
return 0
;
+
LEAVE_RET('i', 0)
;
}
/**
}
/**
- * \fn int Proc_GetMessage(Uint *
Err, Uint *
Source, void *Buffer)
+ * \fn int Proc_GetMessage(Uint *Source, void *Buffer)
* \brief Gets a message
* \brief Gets a message
- * \param Err Pointer to \a errno
* \param Source Where to put the source TID
* \param Buffer Buffer to place the message data (set to NULL to just get message length)
* \param Source Where to put the source TID
* \param Buffer Buffer to place the message data (set to NULL to just get message length)
+ * \return Message length
*/
*/
-int Proc_GetMessage(Uint *
Err, Uint *
Source, void *Buffer)
+int Proc_GetMessage(Uint *Source, void *Buffer)
{
int ret;
{
int ret;
- void *tmp;
+ void
*tmp;
tThread *cur = Proc_GetCurThread();
tThread *cur = Proc_GetCurThread();
+
+ ENTER("pSource pBuffer", Source, Buffer);
// Check if queue has any items
if(!cur->Messages) {
// Check if queue has any items
if(!cur->Messages) {
+ LEAVE('i', 0);
return 0;
}
return 0;
}
- LOCK( &cur->IsLocked );
+
SHORT
LOCK( &cur->IsLocked );
- if(Source)
+ if(Source)
{
*Source = cur->Messages->Source;
*Source = cur->Messages->Source;
+ LOG("*Source = %i", *Source);
+ }
// Get message length
if( !Buffer ) {
ret = cur->Messages->Length;
// Get message length
if( !Buffer ) {
ret = cur->Messages->Length;
- RELEASE( &cur->IsLocked );
+ SHORTREL( &cur->IsLocked );
+ LEAVE('i', ret);
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
+ {
+ if( !CheckMem( Buffer, cur->Messages->Length ) )
+ {
+ LOG("Invalid buffer");
+ errno = -EINVAL;
+ SHORTREL( &cur->IsLocked );
+ LEAVE('i', -1);
+ return -1;
+ }
+ LOG("Copied to buffer");
memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
+ }
ret = cur->Messages->Length;
// Remove from list
ret = cur->Messages->Length;
// Remove from list
- tmp = cur->Messages
->Next
;
-
free(cur->Messages)
;
-
cur->Messages = tmp
;
+ tmp = cur->Messages;
+
cur->Messages = cur->Messages->Next
;
+
if(cur->Messages == NULL) cur->LastMessage = NULL
;
-
RELEASE
( &cur->IsLocked );
+
SHORTREL
( &cur->IsLocked );
+ free(tmp); // Free outside of lock
+
+ LEAVE('i', ret);
return ret;
}
return ret;
}
UCC
git Repository :: git.ucc.asn.au