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
Fixed bug where system would lock if a user task segfaulted (forgot to sti)
[tpg/acess2.git]
/
Kernel
/
messages.c
diff --git
a/Kernel/messages.c
b/Kernel/messages.c
index
31ae8f3
..
93cf6ca
100644
(file)
--- a/
Kernel/messages.c
+++ b/
Kernel/messages.c
@@
-26,7
+26,7
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
}
// Get thread
}
// Get thread
- thread =
Proc
_GetThread( Dest );
+ thread =
Threads
_GetThread( Dest );
// Error check
if(!thread) { return -1; }
// Error check
if(!thread) { return -1; }
@@
-40,7
+40,7
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
// Create message
msg = malloc( sizeof(tMsg)+Length );
msg->Next = NULL;
// Create message
msg = malloc( sizeof(tMsg)+Length );
msg->Next = NULL;
- msg->Source =
gCurrentThread
->TID;
+ msg->Source =
Proc_GetCurThread()
->TID;
msg->Length = Length;
memcpy(msg->Data, Data, Length);
msg->Length = Length;
memcpy(msg->Data, Data, Length);
@@
-55,7
+55,7
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
RELEASE(&thread->IsLocked);
RELEASE(&thread->IsLocked);
- Thread_Wake( thread );
+ Thread
s
_Wake( thread );
return 0;
}
return 0;
}
@@
-68,35
+68,36
@@
int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
{
int ret;
void *tmp;
{
int ret;
void *tmp;
+ tThread *cur = Proc_GetCurThread();
// Check if queue has any items
// Check if queue has any items
- if(!
gCurrentThread
->Messages) {
+ if(!
cur
->Messages) {
return 0;
}
return 0;
}
- LOCK( &
gCurrentThread
->IsLocked );
+ LOCK( &
cur
->IsLocked );
if(Source)
if(Source)
- *Source =
gCurrentThread
->Messages->Source;
+ *Source =
cur
->Messages->Source;
// Get message length
if( !Buffer ) {
// Get message length
if( !Buffer ) {
- ret =
gCurrentThread
->Messages->Length;
- RELEASE( &
gCurrentThread
->IsLocked );
+ ret =
cur
->Messages->Length;
+ RELEASE( &
cur
->IsLocked );
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
- memcpy(Buffer,
gCurrentThread->Messages->Data, gCurrentThread
->Messages->Length);
- ret =
gCurrentThread
->Messages->Length;
+ memcpy(Buffer,
cur->Messages->Data, cur
->Messages->Length);
+ ret =
cur
->Messages->Length;
// Remove from list
// Remove from list
- tmp =
gCurrentThread
->Messages->Next;
- free(
gCurrentThread
->Messages);
-
gCurrentThread
->Messages = tmp;
+ tmp =
cur
->Messages->Next;
+ free(
cur
->Messages);
+
cur
->Messages = tmp;
- RELEASE( &
gCurrentThread
->IsLocked );
+ RELEASE( &
cur
->IsLocked );
return ret;
}
return ret;
}
UCC
git Repository :: git.ucc.asn.au