X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Falloc-pool.c;h=6eecef53ee2ce8503323a637d5bb7bce60d9ccef;hp=14876536cdd1241dd8cfaac136edcaae8ad577ea;hb=b22f66e203c5928a518440558634496a4ff1b391;hpb=64db345d75ae393ca3444aebed0f7c62b91d65bd diff --git a/gcc/alloc-pool.c b/gcc/alloc-pool.c index 14876536cdd..6eecef53ee2 100644 --- a/gcc/alloc-pool.c +++ b/gcc/alloc-pool.c @@ -1,13 +1,13 @@ /* Functions to support a pool of allocatable objects. - Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, + 2007, 2008 Free Software Foundation, Inc. Contributed by Daniel Berlin This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -16,9 +16,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" @@ -42,10 +41,10 @@ typedef struct allocation_object_def /* Because we want any type of data to be well aligned after the ID, the following elements are here. They are never accessed so - the allocated object may be even smaller than this structure. */ + the allocated object may be even smaller than this structure. + We do not care about alignment for floating-point types. */ char *align_p; HOST_WIDEST_INT align_i; - long double align_ld; } u; } allocation_object; @@ -65,14 +64,25 @@ static ALLOC_POOL_ID_TYPE last_id; #ifdef GATHER_STATISTICS -/* Store information about each particular alloc_pool. */ +/* Store information about each particular alloc_pool. Note that this + will underestimate the amount the amount of storage used by a small amount: + 1) The overhead in a pool is not accounted for. + 2) The unallocated elements in a block are not accounted for. Note + that this can at worst case be one element smaller that the block + size for that pool. */ struct alloc_pool_descriptor { const char *name; - int allocated; - int created; - int peak; - int current; + /* Number of pools allocated. */ + unsigned long created; + /* Gross allocated storage. */ + unsigned long allocated; + /* Amount of currently active storage. */ + unsigned long current; + /* Peak amount of storage used. */ + unsigned long peak; + /* Size of element in the pool. */ + int elt_size; }; /* Hashtable mapping alloc_pool names to descriptors. */ @@ -82,13 +92,15 @@ static htab_t alloc_pool_hash; static hashval_t hash_descriptor (const void *p) { - const struct alloc_pool_descriptor *d = p; + const struct alloc_pool_descriptor *const d = + (const struct alloc_pool_descriptor * )p; return htab_hash_pointer (d->name); } static int eq_descriptor (const void *p1, const void *p2) { - const struct alloc_pool_descriptor *d = p1; + const struct alloc_pool_descriptor *const d = + (const struct alloc_pool_descriptor *) p1; return d->name == p2; } @@ -103,11 +115,11 @@ alloc_pool_descriptor (const char *name) slot = (struct alloc_pool_descriptor **) htab_find_slot_with_hash (alloc_pool_hash, name, - htab_hash_pointer (name), - 1); + htab_hash_pointer (name), + INSERT); if (*slot) return *slot; - *slot = xcalloc (sizeof (**slot), 1); + *slot = XCNEW (struct alloc_pool_descriptor); (*slot)->name = name; return *slot; } @@ -120,7 +132,7 @@ alloc_pool create_alloc_pool (const char *name, size_t size, size_t num) { alloc_pool pool; - size_t pool_size, header_size; + size_t header_size; #ifdef GATHER_STATISTICS struct alloc_pool_descriptor *desc; #endif @@ -142,16 +154,14 @@ create_alloc_pool (const char *name, size_t size, size_t num) /* Um, we can't really allocate 0 elements per block. */ gcc_assert (num); - /* Find the size of the pool structure, and the name. */ - pool_size = sizeof (struct alloc_pool_def); - - /* and allocate that much memory. */ - pool = xmalloc (pool_size); + /* Allocate memory for the pool structure. */ + pool = XNEW (struct alloc_pool_def); /* Now init the various pieces of our pool structure. */ pool->name = /*xstrdup (name)*/name; #ifdef GATHER_STATISTICS desc = alloc_pool_descriptor (name); + desc->elt_size = size; desc->created++; #endif pool->elt_size = size; @@ -161,7 +171,9 @@ create_alloc_pool (const char *name, size_t size, size_t num) header_size = align_eight (sizeof (struct alloc_pool_list_def)); pool->block_size = (size * num) + header_size; - pool->free_list = NULL; + pool->returned_free_list = NULL; + pool->virgin_free_list = NULL; + pool->virgin_elts_remaining = 0; pool->elts_allocated = 0; pool->elts_free = 0; pool->blocks_allocated = 0; @@ -182,7 +194,7 @@ create_alloc_pool (const char *name, size_t size, size_t num) /* Free all memory allocated for the given memory pool. */ void -free_alloc_pool (alloc_pool pool) +empty_alloc_pool (alloc_pool pool) { alloc_pool_list block, next_block; #ifdef GATHER_STATISTICS @@ -196,10 +208,26 @@ free_alloc_pool (alloc_pool pool) { next_block = block->next; free (block); + } + #ifdef GATHER_STATISTICS - desc->current -= pool->block_size; + desc->current -= (pool->elts_allocated - pool->elts_free) * pool->elt_size; #endif - } + pool->returned_free_list = NULL; + pool->virgin_free_list = NULL; + pool->virgin_elts_remaining = 0; + pool->elts_allocated = 0; + pool->elts_free = 0; + pool->blocks_allocated = 0; + pool->block_list = NULL; +} + +/* Free all memory allocated for the given memory pool and the pool itself. */ +void +free_alloc_pool (alloc_pool pool) +{ + /* First empty the pool. */ + empty_alloc_pool (pool); #ifdef ENABLE_CHECKING memset (pool, 0xaf, sizeof (*pool)); #endif @@ -207,61 +235,80 @@ free_alloc_pool (alloc_pool pool) free (pool); } +/* Frees the alloc_pool, if it is empty and zero *POOL in this case. */ +void +free_alloc_pool_if_empty (alloc_pool *pool) +{ + if ((*pool)->elts_free == (*pool)->elts_allocated) + { + free_alloc_pool (*pool); + *pool = NULL; + } +} + /* Allocates one element from the pool specified. */ void * pool_alloc (alloc_pool pool) { alloc_pool_list header; - char *block; #ifdef GATHER_STATISTICS struct alloc_pool_descriptor *desc = alloc_pool_descriptor (pool->name); - desc->allocated+=pool->elt_size; + desc->allocated += pool->elt_size; + desc->current += pool->elt_size; + if (desc->peak < desc->current) + desc->peak = desc->current; #endif gcc_assert (pool); /* If there are no more free elements, make some more!. */ - if (!pool->free_list) + if (!pool->returned_free_list) { - size_t i; - alloc_pool_list block_header; - - /* Make the block. */ - block = xmalloc (pool->block_size); - block_header = (alloc_pool_list) block; - block += align_eight (sizeof (struct alloc_pool_list_def)); -#ifdef GATHER_STATISTICS - desc->current += pool->block_size; - if (desc->peak < desc->current) - desc->peak = desc->current; -#endif - - /* Throw it on the block list. */ - block_header->next = pool->block_list; - pool->block_list = block_header; - - /* Now put the actual block pieces onto the free list. */ - for (i = 0; i < pool->elts_per_block; i++, block += pool->elt_size) - { + char *block; + if (!pool->virgin_elts_remaining) + { + alloc_pool_list block_header; + + /* Make the block. */ + block = XNEWVEC (char, pool->block_size); + block_header = (alloc_pool_list) block; + block += align_eight (sizeof (struct alloc_pool_list_def)); + + /* Throw it on the block list. */ + block_header->next = pool->block_list; + pool->block_list = block_header; + + /* Make the block available for allocation. */ + pool->virgin_free_list = block; + pool->virgin_elts_remaining = pool->elts_per_block; + + /* Also update the number of elements we have free/allocated, and + increment the allocated block count. */ + pool->elts_allocated += pool->elts_per_block; + pool->elts_free += pool->elts_per_block; + pool->blocks_allocated += 1; + } + + + /* We now know that we can take the first elt off the virgin list and + put it on the returned list. */ + block = pool->virgin_free_list; + header = (alloc_pool_list) USER_PTR_FROM_ALLOCATION_OBJECT_PTR (block); + header->next = NULL; #ifdef ENABLE_CHECKING - /* Mark the element to be free. */ - ((allocation_object *) block)->id = 0; + /* Mark the element to be free. */ + ((allocation_object *) block)->id = 0; #endif - header = (alloc_pool_list) USER_PTR_FROM_ALLOCATION_OBJECT_PTR (block); - header->next = pool->free_list; - pool->free_list = header; - } - /* Also update the number of elements we have free/allocated, and - increment the allocated block count. */ - pool->elts_allocated += pool->elts_per_block; - pool->elts_free += pool->elts_per_block; - pool->blocks_allocated += 1; + pool->returned_free_list = header; + pool->virgin_free_list += pool->elt_size; + pool->virgin_elts_remaining--; + } /* Pull the first free element from the free list, and return it. */ - header = pool->free_list; - pool->free_list = header->next; + header = pool->returned_free_list; + pool->returned_free_list = header->next; pool->elts_free--; #ifdef ENABLE_CHECKING @@ -277,15 +324,18 @@ void pool_free (alloc_pool pool, void *ptr) { alloc_pool_list header; +#ifdef GATHER_STATISTICS + struct alloc_pool_descriptor *desc = alloc_pool_descriptor (pool->name); +#endif gcc_assert (ptr); #ifdef ENABLE_CHECKING - memset (ptr, 0xaf, pool->elt_size - offsetof (allocation_object, u.data)); - /* Check whether the PTR was allocated from POOL. */ gcc_assert (pool->id == ALLOCATION_OBJECT_PTR_FROM_USER_PTR (ptr)->id); + memset (ptr, 0xaf, pool->elt_size - offsetof (allocation_object, u.data)); + /* Mark the element to be free. */ ALLOCATION_OBJECT_PTR_FROM_USER_PTR (ptr)->id = 0; #else @@ -294,9 +344,14 @@ pool_free (alloc_pool pool, void *ptr) #endif header = (alloc_pool_list) ptr; - header->next = pool->free_list; - pool->free_list = header; + header->next = pool->returned_free_list; + pool->returned_free_list = header; pool->elts_free++; + +#ifdef GATHER_STATISTICS + desc->current -= pool->elt_size; +#endif + } /* Output per-alloc_pool statistics. */ #ifdef GATHER_STATISTICS @@ -304,8 +359,8 @@ pool_free (alloc_pool pool, void *ptr) /* Used to accumulate statistics about alloc_pool sizes. */ struct output_info { - int count; - int size; + unsigned long total_created; + unsigned long total_allocated; }; /* Called via htab_traverse. Output alloc_pool descriptor pointed out by SLOT @@ -318,29 +373,35 @@ print_statistics (void **slot, void *b) if (d->allocated) { - fprintf (stderr, "%-21s %6d %10d %10d %10d\n", d->name, - d->created, d->allocated, d->peak, d->current); - i->size += d->allocated; - i->count += d->created; + fprintf (stderr, "%-22s %6d %10lu %10lu(%10lu) %10lu(%10lu) %10lu(%10lu)\n", d->name, + d->elt_size, d->created, d->allocated, d->allocated / d->elt_size, + d->peak, d->peak / d->elt_size, + d->current, d->current / d->elt_size); + i->total_allocated += d->allocated; + i->total_created += d->created; } return 1; } #endif /* Output per-alloc_pool memory usage statistics. */ -void dump_alloc_pool_statistics (void) +void +dump_alloc_pool_statistics (void) { #ifdef GATHER_STATISTICS struct output_info info; - fprintf (stderr, "\nAlloc-pool Kind Pools Allocated Peak Leak\n"); - fprintf (stderr, "-------------------------------------------------------------\n"); - info.count = 0; - info.size = 0; + if (!alloc_pool_hash) + return; + + fprintf (stderr, "\nAlloc-pool Kind Elt size Pools Allocated (elts) Peak (elts) Leak (elts)\n"); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); + info.total_created = 0; + info.total_allocated = 0; htab_traverse (alloc_pool_hash, print_statistics, &info); - fprintf (stderr, "-------------------------------------------------------------\n"); - fprintf (stderr, "%-20s %7d %10d\n", - "Total", info.count, info.size); - fprintf (stderr, "-------------------------------------------------------------\n"); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); + fprintf (stderr, "%-22s %7lu %10lu\n", + "Total", info.total_created, info.total_allocated); + fprintf (stderr, "--------------------------------------------------------------------------------------------------------------\n"); #endif }