From 93ba8160b62a79f7d0823dec4972a498c9a3bcc6 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 18 Nov 2013 14:45:36 +0800 Subject: [PATCH] Kernel - Fixed threads entering EVENTSLEEP with event pending --- KernelLand/Kernel/events.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/KernelLand/Kernel/events.c b/KernelLand/Kernel/events.c index 2b39714e..b0225efe 100644 --- a/KernelLand/Kernel/events.c +++ b/KernelLand/Kernel/events.c @@ -83,10 +83,13 @@ Uint32 Threads_WaitEvents(Uint32 EventMask) // Check if a wait is needed SHORTLOCK( &us->IsLocked ); LOG("Locked and preparing for wait"); - Threads_int_Sleep(THREAD_STAT_EVENTSLEEP, NULL, EventMask, - &us, NULL, &us->IsLocked); - // Woken when lock is acquired - SHORTLOCK( &us->IsLocked ); + if( (us->EventState & EventMask) == 0 ) + { + Threads_int_Sleep(THREAD_STAT_EVENTSLEEP, NULL, EventMask, + &us, NULL, &us->IsLocked); + // Woken when lock is acquired + SHORTLOCK( &us->IsLocked ); + } // Get return value and clear changed event bits rv = us->EventState & EventMask; -- 2.20.1