diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utcache.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utcache.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sys/contrib/dev/acpica/utcache.c b/sys/contrib/dev/acpica/utcache.c index 8e568a5..56e88b3 100644 --- a/sys/contrib/dev/acpica/utcache.c +++ b/sys/contrib/dev/acpica/utcache.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utcache - local cache allocation routines - * $Revision: 1.2 $ + * $Revision: 1.8 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2005, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2007, Intel Corp. * All rights reserved. * * 2. License @@ -212,7 +212,7 @@ AcpiOsPurgeCache ( Next = *(ACPI_CAST_INDIRECT_PTR (char, &(((char *) Cache->ListHead)[Cache->LinkOffset]))); - ACPI_MEM_FREE (Cache->ListHead); + ACPI_FREE (Cache->ListHead); Cache->ListHead = Next; Cache->CurrentDepth--; @@ -294,7 +294,7 @@ AcpiOsReleaseObject ( if (Cache->CurrentDepth >= Cache->MaxDepth) { - ACPI_MEM_FREE (Object); + ACPI_FREE (Object); ACPI_MEM_TRACKING (Cache->TotalFreed++); } @@ -348,7 +348,7 @@ AcpiOsAcquireObject ( void *Object; - ACPI_FUNCTION_NAME ("OsAcquireObject"); + ACPI_FUNCTION_NAME (OsAcquireObject); if (!Cache) @@ -377,8 +377,8 @@ AcpiOsAcquireObject ( Cache->CurrentDepth--; ACPI_MEM_TRACKING (Cache->Hits++); - ACPI_MEM_TRACKING (ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, - "Object %p from %s cache\n", Object, Cache->ListName))); + ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, + "Object %p from %s cache\n", Object, Cache->ListName)); Status = AcpiUtReleaseMutex (ACPI_MTX_CACHES); if (ACPI_FAILURE (Status)) @@ -396,7 +396,14 @@ AcpiOsAcquireObject ( ACPI_MEM_TRACKING (Cache->TotalAllocated++); - /* Avoid deadlock with ACPI_MEM_CALLOCATE */ +#ifdef ACPI_DBG_TRACK_ALLOCATIONS + if ((Cache->TotalAllocated - Cache->TotalFreed) > Cache->MaxOccupied) + { + Cache->MaxOccupied = Cache->TotalAllocated - Cache->TotalFreed; + } +#endif + + /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */ Status = AcpiUtReleaseMutex (ACPI_MTX_CACHES); if (ACPI_FAILURE (Status)) @@ -404,7 +411,7 @@ AcpiOsAcquireObject ( return (NULL); } - Object = ACPI_MEM_CALLOCATE (Cache->ObjectSize); + Object = ACPI_ALLOCATE_ZEROED (Cache->ObjectSize); if (!Object) { return (NULL); |
