mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
- Actually I realised it isn't valid to touch the object at all after
decrementing the reference count unless the reference count was one. I also removed the retention check in ObfReferenceObject since I couldn't see how this would ever be needed. svn path=/trunk/; revision=8659
This commit is contained in:
David Welch
parent
c61a3955d5
commit
f12f44e036
1 changed files with 61 additions and 55 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: object.c,v 1.76 2004/03/12 00:28:13 dwelch Exp $
|
||||
/* $Id: object.c,v 1.77 2004/03/12 00:46:35 dwelch Exp $
|
||||
*
|
||||
* COPYRIGHT: See COPYING in the top level directory
|
||||
* PROJECT: ReactOS kernel
|
||||
|
|
@ -565,7 +565,7 @@ ObOpenObjectByPointer(IN POBJECT Object,
|
|||
|
||||
|
||||
static NTSTATUS
|
||||
ObpPerformRetentionChecks(POBJECT_HEADER Header)
|
||||
ObpDeleteObject(POBJECT_HEADER Header)
|
||||
{
|
||||
DPRINT("ObPerformRetentionChecks(Header %p)\n", Header);
|
||||
if (KeGetCurrentIrql() != PASSIVE_LEVEL)
|
||||
|
|
@ -594,7 +594,7 @@ ObpPerformRetentionChecks(POBJECT_HEADER Header)
|
|||
|
||||
|
||||
VOID STDCALL
|
||||
ObpPerformRetentionChecksWorkRoutine (IN PVOID Parameter)
|
||||
ObpDeleteObjectWorkRoutine (IN PVOID Parameter)
|
||||
{
|
||||
PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter;
|
||||
/* ULONG Tag; */ /* See below */
|
||||
|
|
@ -604,34 +604,32 @@ ObpPerformRetentionChecksWorkRoutine (IN PVOID Parameter)
|
|||
|
||||
/* Turn this on when we have ExFreePoolWithTag
|
||||
Tag = Params->ObjectHeader->ObjectType->Tag; */
|
||||
ObpPerformRetentionChecks(Params->ObjectHeader);
|
||||
ObpDeleteObject(Params->ObjectHeader);
|
||||
ExFreePool(Params);
|
||||
/* ExFreePoolWithTag(Params, Tag); */
|
||||
}
|
||||
|
||||
|
||||
static NTSTATUS
|
||||
ObpPerformRetentionChecksDpcLevel(IN POBJECT_HEADER ObjectHeader,
|
||||
STATIC NTSTATUS
|
||||
ObpDeleteObjectDpcLevel(IN POBJECT_HEADER ObjectHeader,
|
||||
IN LONG OldRefCount)
|
||||
{
|
||||
if (ObjectHeader->RefCount < 0)
|
||||
{
|
||||
CPRINT("Object %p/%p has invalid reference count (%d)\n",
|
||||
ObjectHeader, HEADER_TO_BODY(ObjectHeader), ObjectHeader->RefCount);
|
||||
ObjectHeader, HEADER_TO_BODY(ObjectHeader),
|
||||
ObjectHeader->RefCount);
|
||||
KEBUGCHECK(0);
|
||||
}
|
||||
|
||||
if (ObjectHeader->HandleCount < 0)
|
||||
{
|
||||
CPRINT("Object %p/%p has invalid handle count (%d)\n",
|
||||
ObjectHeader, HEADER_TO_BODY(ObjectHeader), ObjectHeader->HandleCount);
|
||||
ObjectHeader, HEADER_TO_BODY(ObjectHeader),
|
||||
ObjectHeader->HandleCount);
|
||||
KEBUGCHECK(0);
|
||||
}
|
||||
|
||||
if (OldRefCount == 0 &&
|
||||
ObjectHeader->HandleCount == 0 &&
|
||||
ObjectHeader->Permanent == FALSE)
|
||||
{
|
||||
if (ObjectHeader->CloseInProcess)
|
||||
{
|
||||
KEBUGCHECK(0);
|
||||
|
|
@ -642,7 +640,7 @@ ObpPerformRetentionChecksDpcLevel(IN POBJECT_HEADER ObjectHeader,
|
|||
switch (KeGetCurrentIrql ())
|
||||
{
|
||||
case PASSIVE_LEVEL:
|
||||
return ObpPerformRetentionChecks (ObjectHeader);
|
||||
return ObpDeleteObject (ObjectHeader);
|
||||
|
||||
case APC_LEVEL:
|
||||
case DISPATCH_LEVEL:
|
||||
|
|
@ -650,15 +648,16 @@ ObpPerformRetentionChecksDpcLevel(IN POBJECT_HEADER ObjectHeader,
|
|||
PRETENTION_CHECK_PARAMS Params;
|
||||
|
||||
/*
|
||||
* Can we get rid of this NonPagedPoolMustSucceed call and still be a
|
||||
* 'must succeed' function? I don't like to bugcheck on no memory!
|
||||
We use must succeed pool here because if the allocation fails
|
||||
then we leak memory.
|
||||
*/
|
||||
Params = (PRETENTION_CHECK_PARAMS)ExAllocatePoolWithTag(NonPagedPoolMustSucceed,
|
||||
Params = (PRETENTION_CHECK_PARAMS)
|
||||
ExAllocatePoolWithTag(NonPagedPoolMustSucceed,
|
||||
sizeof(RETENTION_CHECK_PARAMS),
|
||||
ObjectHeader->ObjectType->Tag);
|
||||
Params->ObjectHeader = ObjectHeader;
|
||||
ExInitializeWorkItem(&Params->WorkItem,
|
||||
ObpPerformRetentionChecksWorkRoutine,
|
||||
ObpDeleteObjectWorkRoutine,
|
||||
(PVOID)Params);
|
||||
ExQueueWorkItem(&Params->WorkItem,
|
||||
CriticalWorkQueue);
|
||||
|
|
@ -666,12 +665,11 @@ ObpPerformRetentionChecksDpcLevel(IN POBJECT_HEADER ObjectHeader,
|
|||
return STATUS_PENDING;
|
||||
|
||||
default:
|
||||
DPRINT("ObpPerformRetentionChecksDpcLevel called at unsupported IRQL %u!\n",
|
||||
KeGetCurrentIrql());
|
||||
DPRINT("ObpPerformRetentionChecksDpcLevel called at unsupported "
|
||||
"IRQL %u!\n", KeGetCurrentIrql());
|
||||
KEBUGCHECK(0);
|
||||
return STATUS_UNSUCCESSFUL;
|
||||
}
|
||||
}
|
||||
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
|
@ -697,7 +695,6 @@ VOID FASTCALL
|
|||
ObfReferenceObject(IN PVOID Object)
|
||||
{
|
||||
POBJECT_HEADER Header;
|
||||
LONG NewRefCount;
|
||||
|
||||
assert(Object);
|
||||
|
||||
|
|
@ -709,8 +706,7 @@ ObfReferenceObject(IN PVOID Object)
|
|||
KEBUGCHECK(0);
|
||||
}
|
||||
|
||||
NewRefCount = InterlockedIncrement(&Header->RefCount);
|
||||
ObpPerformRetentionChecksDpcLevel(Header, NewRefCount);
|
||||
(VOID)InterlockedIncrement(&Header->RefCount);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -735,20 +731,30 @@ ObfDereferenceObject(IN PVOID Object)
|
|||
{
|
||||
POBJECT_HEADER Header;
|
||||
LONG NewRefCount;
|
||||
BOOL Permanent;
|
||||
ULONG HandleCount;
|
||||
|
||||
assert(Object);
|
||||
|
||||
/* Extract the object header. */
|
||||
Header = BODY_TO_HEADER(Object);
|
||||
Permanent = Header->Permanent;
|
||||
HandleCount = Header->HandleCount;
|
||||
|
||||
/*
|
||||
Drop our reference and get the new count so we can tell if this was the
|
||||
last reference.
|
||||
*/
|
||||
NewRefCount = InterlockedDecrement(&Header->RefCount);
|
||||
assert(NewRefCount >= 0);
|
||||
|
||||
/* Check whether the object can now be deleted. */
|
||||
ObpPerformRetentionChecksDpcLevel(Header, NewRefCount);
|
||||
if (NewRefCount == 0 &&
|
||||
HandleCount == 0 &&
|
||||
!Permanent)
|
||||
{
|
||||
ObpDeleteObjectDpcLevel(Header, NewRefCount);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue