Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-06 05:34:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Implement KiRecalculateDueTime to handle cases where a timeout wait has been interupted by an APC or alerted, and it needs to be recalculated in the relative case. (This fixes the "contact alex" bugcheck).

Browse source 
svn path=/trunk/; revision=23229
This commit is contained in:
Alex Ionescu 2006-07-22 17:19:09 +00:00
parent d310e2ae8c
commit 7af4849812
4 changed files with 60 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/ntoskrnl/KrnlFun.c
View file

@ -45,8 +45,5 @@
// - Use pushlocks for handle implementation.
// - Figure out why cmd.exe won't close anymore.
//
// Ke:
// - Add code for interval recalulation when wait interrupted by an APC
//
///////////////////////////////////////////////////////////////////////////////

18
reactos/ntoskrnl/include/internal/ke_x.h
View file

@ -155,6 +155,24 @@
} \
}
//
// Recalculates the due time
//
PLARGE_INTEGER
FORCEINLINE
KiRecalculateDueTime(IN PLARGE_INTEGER OriginalDueTime,
IN PLARGE_INTEGER DueTime,
IN OUT PLARGE_INTEGER NewDueTime)
{
/* Don't do anything for absolute waits */
if (OriginalDueTime->QuadPart >= 0) return OriginalDueTime;
/* Otherwise, query the interrupt time and recalculate */
NewDueTime->QuadPart = KeQueryInterruptTime();
NewDueTime->QuadPart -= DueTime->QuadPart;
return NewDueTime;
}
//
// Determines wether a thread should be added to the wait list
//

18
reactos/ntoskrnl/ke/queue.c
View file

@ -249,6 +249,8 @@ KeRemoveQueue(IN PKQUEUE Queue,
PKWAIT_BLOCK WaitBlock;
PKTIMER Timer;
BOOLEAN Swappable;
PLARGE_INTEGER OriginalDueTime = Timeout;
LARGE_INTEGER DueTime, NewDueTime;
ASSERT_QUEUE(Queue);
ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
@ -396,7 +398,15 @@ KeRemoveQueue(IN PKQUEUE Queue,
&Timer->Header.WaitListHead;
/* Create Timer */
KiInsertTimer(Timer, *Timeout);
if (!KiInsertTimer(Timer, *Timeout))
{
/* FIXME */
DPRINT1("If you see thie message contact Alex ASAP\n");
KEBUGCHECK(0);
}
/* Set timer due time */
DueTime.QuadPart = Timer->DueTime.QuadPart;
}
/* Close the loop */
@ -431,8 +441,10 @@ KeRemoveQueue(IN PKQUEUE Queue,
/* Check if we had a timeout */
if (Timeout)
{
DPRINT1("If you see this message, contact Alex ASAP\n");
KEBUGCHECK(0);
/* Recalculate due times */
Timeout = KiRecalculateDueTime(OriginalDueTime,
&DueTime,
&NewDueTime);
}
}

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

@ -275,6 +275,8 @@ KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
PKTHREAD CurrentThread = KeGetCurrentThread();
NTSTATUS WaitStatus = STATUS_SUCCESS;
BOOLEAN Swappable;
PLARGE_INTEGER OriginalDueTime = Interval;
LARGE_INTEGER DueTime, NewDueTime;
/* Check if the lock is already held */
if (CurrentThread->WaitNext)
@ -335,6 +337,9 @@ KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
break;
}
/* Save due time */
DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
/* Handle Kernel Queues */
if (CurrentThread->Queue) KiWakeQueue(CurrentThread->Queue);
@ -360,9 +365,10 @@ KeDelayExecutionThread(IN KPROCESSOR_MODE WaitMode,
return WaitStatus;
}
/* Check if we had a timeout */
DPRINT1("If you see this message, contact Alex ASAP\n");
KEBUGCHECK(0);
/* Recalculate due times */
Interval = KiRecalculateDueTime(OriginalDueTime,
&DueTime,
&NewDueTime);
}
/* Acquire again the lock */
@ -392,6 +398,8 @@ KeWaitForSingleObject(IN PVOID Object,
PKTHREAD CurrentThread = KeGetCurrentThread();
NTSTATUS WaitStatus = STATUS_SUCCESS;
BOOLEAN Swappable;
LARGE_INTEGER DueTime, NewDueTime;
PLARGE_INTEGER OriginalDueTime = Timeout;
/* Check if the lock is already held */
if (CurrentThread->WaitNext)
@ -506,6 +514,9 @@ KeWaitForSingleObject(IN PVOID Object,
WaitStatus = STATUS_TIMEOUT;
goto DontWait;
}
/* Set the current due time */
DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
}
else
{
@ -538,8 +549,10 @@ KeWaitForSingleObject(IN PVOID Object,
/* Check if we had a timeout */
if (Timeout)
{
DPRINT1("If you see this message, contact Alex ASAP\n");
KEBUGCHECK(0);
/* Recalculate due times */
Timeout = KiRecalculateDueTime(OriginalDueTime,
&DueTime,
&NewDueTime);
}
}
@ -583,6 +596,8 @@ KeWaitForMultipleObjects(IN ULONG Count,
ULONG WaitIndex;
NTSTATUS WaitStatus = STATUS_SUCCESS;
BOOLEAN Swappable;
PLARGE_INTEGER OriginalDueTime = Timeout;
LARGE_INTEGER DueTime, NewDueTime;
/* Set the Current Thread */
CurrentThread = KeGetCurrentThread();
@ -781,6 +796,9 @@ KeWaitForMultipleObjects(IN ULONG Count,
WaitStatus = STATUS_TIMEOUT;
goto DontWait;
}
/* Set the current due time */
DueTime.QuadPart = ThreadTimer->DueTime.QuadPart;
}
/* Insert into Object's Wait List*/
@ -819,8 +837,10 @@ KeWaitForMultipleObjects(IN ULONG Count,
/* Check if we had a timeout */
if (Timeout)
{
DPRINT1("If you see this message, contact Alex ASAP\n");
KEBUGCHECK(0);
/* Recalculate due times */
Timeout = KiRecalculateDueTime(OriginalDueTime,
&DueTime,
&NewDueTime);
}
/* Acquire again the lock */