mirror of
https://github.com/reactos/reactos.git
synced 2024-10-01 06:57:08 +00:00
[NTOSKRNL]
- Assert against waiting at DISPATCH_LEVEL svn path=/trunk/; revision=56747
This commit is contained in:
parent
8479f39975
commit
e3eb92dddf
|
@ -126,14 +126,14 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
|
|||
|
||||
/* We depend on these bits being just right */
|
||||
C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC);
|
||||
|
||||
|
||||
/* Increase the contention count */
|
||||
GuardedMutex->Contention++;
|
||||
|
||||
|
||||
/* Start by unlocking the Guarded Mutex */
|
||||
BitsToRemove = GM_LOCK_BIT;
|
||||
BitsToAdd = GM_LOCK_WAITER_INC;
|
||||
|
||||
|
||||
/* Start change loop */
|
||||
for (;;)
|
||||
{
|
||||
|
@ -142,10 +142,10 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
|
|||
(BitsToRemove == (GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN)));
|
||||
ASSERT((BitsToAdd == GM_LOCK_WAITER_INC) ||
|
||||
(BitsToAdd == GM_LOCK_WAITER_WOKEN));
|
||||
|
||||
|
||||
/* Get the Count Bits */
|
||||
OldValue = GuardedMutex->Count;
|
||||
|
||||
|
||||
/* Start internal bit change loop */
|
||||
for (;;)
|
||||
{
|
||||
|
@ -155,7 +155,7 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
|
|||
/* Sanity check */
|
||||
ASSERT((BitsToRemove == GM_LOCK_BIT) ||
|
||||
((OldValue & GM_LOCK_WAITER_WOKEN) != 0));
|
||||
|
||||
|
||||
/* Unlock it by removing the Lock Bit */
|
||||
NewValue = OldValue ^ BitsToRemove;
|
||||
NewValue = InterlockedCompareExchange(&GuardedMutex->Count,
|
||||
|
@ -172,15 +172,15 @@ KiAcquireGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex)
|
|||
OldValue);
|
||||
if (NewValue == OldValue) break;
|
||||
}
|
||||
|
||||
|
||||
/* Old value changed, loop again */
|
||||
OldValue = NewValue;
|
||||
}
|
||||
|
||||
|
||||
/* Now we have to wait for it */
|
||||
KeWaitForGate(&GuardedMutex->Gate, WrGuardedMutex, KernelMode);
|
||||
ASSERT((GuardedMutex->Count & GM_LOCK_WAITER_WOKEN) != 0);
|
||||
|
||||
|
||||
/* Ok, the wait is done, so set the new bits */
|
||||
BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN;
|
||||
BitsToAdd = GM_LOCK_WAITER_WOKEN;
|
||||
|
@ -417,6 +417,10 @@ KeWaitForSingleObject(IN PVOID Object,
|
|||
PLARGE_INTEGER OriginalDueTime = Timeout;
|
||||
ULONG Hand = 0;
|
||||
|
||||
ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL ||
|
||||
(KeGetCurrentIrql() == DISPATCH_LEVEL &&
|
||||
Timeout && Timeout->QuadPart == 0));
|
||||
|
||||
/* Check if the lock is already held */
|
||||
if (!Thread->WaitNext) goto WaitStart;
|
||||
|
||||
|
@ -583,6 +587,10 @@ KeWaitForMultipleObjects(IN ULONG Count,
|
|||
LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime;
|
||||
ULONG Index, Hand = 0;
|
||||
|
||||
ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL ||
|
||||
(KeGetCurrentIrql() == DISPATCH_LEVEL &&
|
||||
Timeout && Timeout->QuadPart == 0));
|
||||
|
||||
/* Make sure the Wait Count is valid */
|
||||
if (!WaitBlockArray)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue