Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 21:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually break out of the wait loops if we got alerted.

Browse source 
svn path=/trunk/; revision=17478
This commit is contained in:
Filip Navara 2005-08-22 21:35:41 +00:00
parent 38caf3038e
commit db6c51690e
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/ntoskrnl/ke/wait.c
View file

@ -27,7 +27,7 @@ static KSPIN_LOCK DispatcherDatabaseLock;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID BOOLEAN
inline inline
FASTCALL FASTCALL
KiCheckAlertability(BOOLEAN Alertable, KiCheckAlertability(BOOLEAN Alertable,
@ -44,6 +44,7 @@ KiCheckAlertability(BOOLEAN Alertable,
CurrentThread->Alerted[(int)WaitMode] = FALSE; CurrentThread->Alerted[(int)WaitMode] = FALSE;
DPRINT("Thread was Alerted\n"); DPRINT("Thread was Alerted\n");
*Status = STATUS_ALERTED; *Status = STATUS_ALERTED;
return TRUE;
/* If there are User APCs Pending, then we can't really be alertable */ /* If there are User APCs Pending, then we can't really be alertable */
} else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) && } else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) &&
@ -52,13 +53,17 @@ KiCheckAlertability(BOOLEAN Alertable,
DPRINT("APCs are Pending\n"); DPRINT("APCs are Pending\n");
CurrentThread->ApcState.UserApcPending = TRUE; CurrentThread->ApcState.UserApcPending = TRUE;
*Status = STATUS_USER_APC; *Status = STATUS_USER_APC;
return TRUE;
} }
/* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */ /* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */
} else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode != KernelMode)) { } else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode != KernelMode)) {
DPRINT("APCs are Pending\n"); DPRINT("APCs are Pending\n");
*Status = STATUS_USER_APC; *Status = STATUS_USER_APC;
return TRUE;
} }
return FALSE;
} }
/* /*
@ -106,7 +111,8 @@ KeDelayExecutionThread(KPROCESSOR_MODE WaitMode,
do { do {
/* We are going to wait no matter what (that's the point), so test Alertability */ /* We are going to wait no matter what (that's the point), so test Alertability */
KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status); if (KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status))
break;
/* Set Timer */ /* Set Timer */
ThreadTimer = &CurrentThread->Timer; ThreadTimer = &CurrentThread->Timer;
@ -256,7 +262,8 @@ KeWaitForSingleObject(PVOID Object,
WaitBlock->NextWaitBlock = WaitBlock; WaitBlock->NextWaitBlock = WaitBlock;
/* Make sure we can satisfy the Alertable request */ /* Make sure we can satisfy the Alertable request */
KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status))
break;
/* Set the Wait Status */ /* Set the Wait Status */
CurrentThread->WaitStatus = Status; CurrentThread->WaitStatus = Status;
@ -485,7 +492,8 @@ KeWaitForMultipleObjects(ULONG Count,
} }
/* Make sure we can satisfy the Alertable request */ /* Make sure we can satisfy the Alertable request */
KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status))
break;
/* Set the Wait Status */ /* Set the Wait Status */
CurrentThread->WaitStatus = Status; CurrentThread->WaitStatus = Status;