Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 22:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a dead lock between an APC (delivered from IoCompleteRequest)

Browse source 
and a call to KeWaitForSingleObject.

svn path=/trunk/; revision=2688
This commit is contained in:
Hartmut Birr 2002-03-08 17:04:03 +00:00
parent 7828679470
commit 5fbc8d0a6e
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
reactos/ntoskrnl/ps/thread.c
View file

@ -1,4 +1,4 @@
/* $Id: thread.c,v 1.89 2002/02/15 14:47:55 ekohl Exp $
/* $Id: thread.c,v 1.90 2002/03/08 17:04:03 hbirr Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -273,24 +273,47 @@ PsBlockThread(PNTSTATUS Status, UCHAR Alertable, ULONG WaitMode,
BOOLEAN DispatcherLock, KIRQL WaitIrql)
{
KIRQL oldIrql;
PETHREAD Thread = PsGetCurrentThread();
PKTHREAD KThread = KeGetCurrentKPCR()->CurrentThread;
PETHREAD Thread = CONTAINING_RECORD (KThread, ETHREAD, Tcb);
PKWAIT_BLOCK WaitBlock;
KeAcquireSpinLock(&PiThreadListLock, &oldIrql);
if (DispatcherLock)
if (KThread->ApcState.KernelApcPending)
{
if (!DispatcherLock)
{
KeAcquireDispatcherDatabaseLock(FALSE);
}
WaitBlock = (PKWAIT_BLOCK)Thread->Tcb.WaitBlockList;
while (WaitBlock)
{
RemoveEntryList (&WaitBlock->WaitListEntry);
WaitBlock = WaitBlock->NextWaitBlock;
}
Thread->Tcb.WaitBlockList = NULL;
KeReleaseDispatcherDatabaseLockAtDpcLevel(FALSE);
PsDispatchThreadNoLock (THREAD_STATE_RUNNABLE);
if (Status != NULL)
{
*Status = STATUS_KERNEL_APC;
}
}
else
{
if (DispatcherLock)
{
KeReleaseDispatcherDatabaseLockAtDpcLevel(FALSE);
}
Thread->Tcb.Alertable = Alertable;
Thread->Tcb.WaitMode = WaitMode;
Thread->Tcb.WaitIrql = WaitIrql;
PsDispatchThreadNoLock(THREAD_STATE_BLOCKED);
if (Status != NULL)
Thread->Tcb.Alertable = Alertable;
Thread->Tcb.WaitMode = WaitMode;
Thread->Tcb.WaitIrql = WaitIrql;
PsDispatchThreadNoLock(THREAD_STATE_BLOCKED);
if (Status != NULL)
{
*Status = Thread->Tcb.WaitStatus;
}
}
KeLowerIrql(WaitIrql);
}