From 6f7536232f8215621955df99b9884c7893bfcb97 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Tue, 8 Nov 2011 14:35:32 +0800 Subject: [PATCH] Kernel - Fixed IPC messages failing when list is emptied - Same bug as threads had months ago :/ --- Kernel/messages.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Kernel/messages.c b/Kernel/messages.c index b70e0788..05f75f11 100644 --- a/Kernel/messages.c +++ b/Kernel/messages.c @@ -1,8 +1,11 @@ /* - * AcessOS Microkernel Version + * Acess2 Kernel + * - By John Hodge (thePowersGang) + * * messages.c + * - IPC Messages */ -#define DEBUG 1 +#define DEBUG 0 #include #include #include @@ -85,21 +88,27 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer) int ret; void *tmp; tThread *cur = Proc_GetCurThread(); + + ENTER("pSource pBuffer", Source, Buffer); // Check if queue has any items if(!cur->Messages) { + LEAVE('i', 0); return 0; } SHORTLOCK( &cur->IsLocked ); - if(Source) + if(Source) { *Source = cur->Messages->Source; + LOG("*Source = %i", *Source); + } // Get message length if( !Buffer ) { ret = cur->Messages->Length; SHORTREL( &cur->IsLocked ); + LEAVE('i', ret); return ret; } @@ -108,10 +117,13 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer) { if( !CheckMem( Buffer, cur->Messages->Length ) ) { + LOG("Invalid buffer"); *Err = -EINVAL; SHORTREL( &cur->IsLocked ); + LEAVE('i', -1); return -1; } + LOG("Copied to buffer"); memcpy(Buffer, cur->Messages->Data, cur->Messages->Length); } ret = cur->Messages->Length; @@ -119,10 +131,12 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer) // Remove from list tmp = cur->Messages; cur->Messages = cur->Messages->Next; + if(cur->Messages == NULL) cur->LastMessage = NULL; SHORTREL( &cur->IsLocked ); free(tmp); // Free outside of lock - + + LEAVE('i', ret); return ret; } -- 2.20.1