mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-07 12:13:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Make ObpReleaseCapturedName an actual function and rename it to ObpFreeObjectNameBuffer. Fix a bug in this function which was causing it to attempt freeing the UNICODE_STRING structure instead of the actual buffer.

Browse Source 
- Implement ObpAllocateObjectNameBuffer instead of inlined code in ObpCaptureObjectAttributes. Enable usage of the Name Buffer Lookaside List since the bug in ObpFreeObjectNameBuffer has now been fixed. This should result in significant speedup and less fragmentation of pool memory.
- Allocate object names in the paged pool instead of non-paged pool, if we can't use the lookaside list.

svn path=/trunk/; revision=25389
This commit is contained in:
Alex Ionescu 2007-01-08 21:02:22 +00:00
parent 00207351ec
commit 9de4aee541
7 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reactos/ntoskrnl/cm/ntfunc.c
View File

@ -577,7 +577,7 @@ Cleanup:
ReleaseCapturedUnicodeString(&CapturedClass,
PreviousMode);
}
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
if (FreeRemainingPath) RtlFreeUnicodeString(&RemainingPath);
//if (Object != NULL) ObDereferenceObject(Object);
@ -1384,7 +1384,7 @@ NtOpenKey(OUT PHANDLE KeyHandle,
PostOpenKeyInfo.Status = Status;
CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo);
ObpReleaseCapturedAttributes(&ObjectCreateInfo);
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
return Status;
}
@ -1436,7 +1436,7 @@ openkey_cleanup:
PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL;
PostOpenKeyInfo.Status = Status;
CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo);
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
if (Object)
{

2
reactos/ntoskrnl/cm/registry.c
View File

@ -548,7 +548,7 @@ CmiConnectHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes,
/* Yields a new reference */
ObpReleaseCapturedAttributes(&ObjectCreateInfo);
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
if (!NT_SUCCESS(Status))
{
return Status;

6
reactos/ntoskrnl/include/internal/ob.h
View File

@ -288,6 +288,12 @@ ObFreeObjectCreateInfoBuffer(
IN POBJECT_CREATE_INFORMATION ObjectCreateInfo
);
VOID
NTAPI
ObpFreeObjectNameBuffer(
IN PUNICODE_STRING Name
);
//
// DOS Devices Functions
//

20
reactos/ntoskrnl/include/internal/ob_x.h
View File

@ -130,7 +130,7 @@ ObpAllocateCapturedAttributes(IN PP_NPAGED_LOOKASIDE_NUMBER Type)
}
VOID
static __inline
FORCEINLINE
ObpFreeCapturedAttributes(IN PVOID Buffer,
IN PP_NPAGED_LOOKASIDE_NUMBER Type)
{
@ -168,23 +168,7 @@ ObpFreeCapturedAttributes(IN PVOID Buffer,
}
VOID
static __inline
ObpReleaseCapturedName(IN PUNICODE_STRING Name)
{
/* We know this is a pool-allocation if the size doesn't match */
if (Name->MaximumLength != 248)
{
ExFreePool(Name->Buffer);
}
else
{
/* Otherwise, free from the lookaside */
ObpFreeCapturedAttributes(Name, LookasideNameBufferList);
}
}
VOID
static __inline
FORCEINLINE
ObpFreeAndReleaseCapturedAttributes(IN POBJECT_CREATE_INFORMATION ObjectCreateInfo)
{
/* First release the attributes, then free them from the lookaside list */

6
reactos/ntoskrnl/ob/obhandle.c
View File

@ -2090,7 +2090,7 @@ Cleanup:
Quickie:
/* Release the object attributes and temporary buffer */
ObpReleaseCapturedAttributes(&TempBuffer->ObjectCreateInfo);
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
ExFreePool(TempBuffer);
/* Return status */
@ -2673,9 +2673,7 @@ NTSTATUS
NTAPI
NtClose(IN HANDLE Handle)
{
//
// Call the internal API
//
/* Call the internal API */
return ObpCloseHandle(Handle, ExGetPreviousMode());
}

102
reactos/ntoskrnl/ob/oblife.c
View File

@ -285,17 +285,70 @@ ObpSetPermanentObject(IN PVOID ObjectBody,
}
}
PWCHAR
NTAPI
ObpAllocateObjectNameBuffer(IN ULONG Length,
IN BOOLEAN UseLookaside,
IN OUT PUNICODE_STRING ObjectName)
{
ULONG MaximumLength;
PVOID Buffer;
/* Set the maximum length to the length plus the terminator */
MaximumLength = Length + sizeof(UNICODE_NULL);
/* Check if we should use the lookaside buffer */
if (!(UseLookaside) || (MaximumLength > 248))
{
/* Nope, allocate directly from pool */
Buffer = ExAllocatePoolWithTag(PagedPool,
MaximumLength,
OB_NAME_TAG);
}
else
{
/* Allocate from the lookaside */
//MaximumLength = 248; <= hack, we should actually set this...!
Buffer = ObpAllocateCapturedAttributes(LookasideNameBufferList);
}
/* Setup the string */
ObjectName->Length = (USHORT)Length;
ObjectName->MaximumLength = (USHORT)MaximumLength;
ObjectName->Buffer = Buffer;
return Buffer;
}
VOID
NTAPI
ObpFreeObjectNameBuffer(IN PUNICODE_STRING Name)
{
PVOID Buffer = Name->Buffer;
/* We know this is a pool-allocation if the size doesn't match */
if (Name->MaximumLength != 248)
{
/* Free it from the pool */
ExFreePool(Buffer);
}
else
{
/* Otherwise, free from the lookaside */
ObpFreeCapturedAttributes(Buffer, LookasideNameBufferList);
}
}
NTSTATUS
NTAPI
ObpCaptureObjectName(IN OUT PUNICODE_STRING CapturedName,
IN PUNICODE_STRING ObjectName,
IN KPROCESSOR_MODE AccessMode,
IN BOOLEAN AllocateFromLookaside)
IN BOOLEAN UseLookaside)
{
NTSTATUS Status = STATUS_SUCCESS;
ULONG StringLength, MaximumLength;
ULONG StringLength;
PWCHAR StringBuffer = NULL;
UNICODE_STRING LocalName = {0}; /* <= GCC 4.0 + Optimizer */
UNICODE_STRING LocalName;
PAGED_CODE();
/* Initialize the Input String */
@ -331,41 +384,20 @@ ObpCaptureObjectName(IN OUT PUNICODE_STRING CapturedName,
}
else
{
/* Set the maximum length to the length plus the terminator */
MaximumLength = StringLength + sizeof(UNICODE_NULL);
/* Check if we should use the lookaside buffer */
//if (!(AllocateFromLookaside) || (MaximumLength > 248))
/* Allocate the string buffer */
StringBuffer = ObpAllocateObjectNameBuffer(StringLength,
UseLookaside,
CapturedName);
if (!StringBuffer)
{
/* Nope, allocate directly from pool */
StringBuffer = ExAllocatePoolWithTag(NonPagedPool,
MaximumLength,
OB_NAME_TAG);
}
//else
{
/* Allocate from the lookaside */
// MaximumLength = 248;
// StringBuffer =
// ObpAllocateCapturedAttributes(LookasideNameBufferList);
}
/* Setup the string */
CapturedName->Length = (USHORT)StringLength;
CapturedName->MaximumLength = (USHORT)MaximumLength;
CapturedName->Buffer = StringBuffer;
/* Make sure we have a buffer */
if (StringBuffer)
{
/* Copy the string and null-terminate it */
RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength);
StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL;
/* Set failure code */
Status = STATUS_INSUFFICIENT_RESOURCES;
}
else
{
/* Fail */
Status = STATUS_INSUFFICIENT_RESOURCES;
/* Copy the name */
RtlMoveMemory(StringBuffer, LocalName.Buffer, StringLength);
StringBuffer[StringLength / sizeof(WCHAR)] = UNICODE_NULL;
}
}
}
@ -875,7 +907,7 @@ ObCreateObject(IN KPROCESSOR_MODE ProbeMode OPTIONAL,
/* Release the Capture Info, we don't need it */
ObpReleaseCapturedAttributes(ObjectCreateInfo);
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName);
}
/* We failed, so release the Buffer */

2
reactos/ntoskrnl/ob/obref.c
View File

@ -454,7 +454,7 @@ ObReferenceObjectByName(IN PUNICODE_STRING ObjectPath,
Quickie:
/* Free the captured name if we had one, and return status */
if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName);
ObpFreeObjectNameBuffer(&ObjectName);
return Status;
}