From 31a014da282db0c3e116d67a28ad522a1cf172e9 Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Thu, 1 Oct 1998 17:35:08 +0000 Subject: [PATCH] Prune unused zalloc components as recommended by Matt Dillon. Extra debugging code is still enabled (it's not very expensive). --- lib/libstand/zalloc.c | 332 +++-------------------------------- lib/libstand/zalloc_defs.h | 4 +- lib/libstand/zalloc_malloc.c | 22 +-- lib/libstand/zalloc_mem.h | 7 +- lib/libstand/zalloc_protos.h | 13 +- 5 files changed, 30 insertions(+), 348 deletions(-) diff --git a/lib/libstand/zalloc.c b/lib/libstand/zalloc.c index 9b4da9e8c8f6..043df8a9a30d 100644 --- a/lib/libstand/zalloc.c +++ b/lib/libstand/zalloc.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zalloc.c,v 1.2 1998/09/26 03:24:14 dillon Exp $ + * $Id: zalloc.c,v 1.3 1998/09/26 10:48:50 dfr Exp $ */ /* @@ -69,79 +69,6 @@ #include "zalloc_defs.h" -Prototype struct MemPool *DummyStructMemPool; -Library void *znalloc(struct MemPool *mpool, iaddr_t bytes); -Library void *zalloc(struct MemPool *mpool, iaddr_t bytes); -Library void *zallocAlign(struct MemPool *mpool, iaddr_t bytes, iaddr_t align); -Library void *zxalloc(struct MemPool *mp, void *addr1, void *addr2, iaddr_t bytes); -Library void *znxalloc(struct MemPool *mp, void *addr1, void *addr2, iaddr_t bytes); -Library char *zallocStr(struct MemPool *mpool, const char *s, int slen); -Library void zfree(struct MemPool *mpool, void *ptr, iaddr_t bytes); -Library void zfreeStr(struct MemPool *mpool, char *s); -Library void zinitPool(struct MemPool *mp, const char *id, void (*fpanic)(const char *ctl, ...), int (*freclaim)(struct MemPool *memPool, iaddr_t bytes), void *pBase, iaddr_t pSize); -Library void zclearPool(struct MemPool *mp); -Library void znop(const char *ctl, ...); -Library int znot(struct MemPool *memPool, iaddr_t bytes); -Library void zallocstats(struct MemPool *mp); - -/* - * znop() - panic function if none supplied. - */ - -void -znop(const char *ctl, ...) -{ -} - -/* - * znot() - reclaim function if none supplied - */ - -int -znot(struct MemPool *memPool, iaddr_t bytes) -{ - return(-1); -} - -#ifndef MALLOCLIB - -/* - * zalloc() - allocate and zero memory from pool. Call reclaim - * and retry if appropriate, return NULL if unable to allocate - * memory. - */ - -void * -zalloc(MemPool *mp, iaddr_t bytes) -{ - void *ptr; - - if ((ptr = znalloc(mp, bytes)) != NULL) - bzero(ptr, bytes); - return(ptr); -} - -/* - * zallocAlign() - allocate and zero memory from pool, enforce specified - * alignment (must be power of 2) on allocated memory. - */ - -void * -zallocAlign(struct MemPool *mp, iaddr_t bytes, iaddr_t align) -{ - void *ptr; - - --align; - bytes = (bytes + align) & ~align; - - if ((ptr = znalloc(mp, bytes)) != NULL) { - bzero(ptr, bytes); - } - return(ptr); -} - -#endif - /* * znalloc() - allocate memory (without zeroing) from pool. Call reclaim * and retry if appropriate, return NULL if unable to allocate @@ -161,148 +88,27 @@ znalloc(MemPool *mp, iaddr_t bytes) if (bytes == 0) return((void *)-1); - do { - /* - * locate freelist entry big enough to hold the object. If all objects - * are the same size, this is a constant-time function. - */ - - if (bytes <= mp->mp_Size - mp->mp_Used) { - MemNode **pmn; - MemNode *mn; - - for (pmn = &mp->mp_First; (mn=*pmn) != NULL; pmn = &mn->mr_Next) { - if (bytes > mn->mr_Bytes) - continue; - - /* - * Cut a chunk of memory out of the beginning of this - * block and fixup the link appropriately. - */ - - { - char *ptr = (char *)mn; - - if (mn->mr_Bytes == bytes) { - *pmn = mn->mr_Next; - } else { - mn = (MemNode *)((char *)mn + bytes); - mn->mr_Next = ((MemNode *)ptr)->mr_Next; - mn->mr_Bytes = ((MemNode *)ptr)->mr_Bytes - bytes; - *pmn = mn; - } - mp->mp_Used += bytes; - return(ptr); - } - } - } - } while (mp->mp_Reclaim(mp, bytes) == 0); - /* - * Memory pool is full, return NULL. - */ - - return(NULL); -} - -#ifndef MALLOCLIB - -/* - * z[n]xalloc() - allocate memory from within a specific address region. - * If allocating AT a specific address, then addr2 must be - * set to addr1 + bytes (and this only works if addr1 is - * already aligned). addr1 and addr2 are aligned by - * MEMNODE_SIZE_MASK + 1 (i.e. they wlill be 8 or 16 byte - * aligned depending on the machine core). - */ - -void * -zxalloc(MemPool *mp, void *addr1, void *addr2, iaddr_t bytes) -{ - void *ptr; - - if ((ptr = znxalloc(mp, addr1, addr2, bytes)) != NULL) - bzero(ptr, bytes); - return(ptr); -} - -void * -znxalloc(MemPool *mp, void *addr1, void *addr2, iaddr_t bytes) -{ - /* - * align according to pool object size (can be 0). This is - * inclusive of the MEMNODE_SIZE_MASK minimum alignment. - */ - bytes = (bytes + MEMNODE_SIZE_MASK) & ~MEMNODE_SIZE_MASK; - addr1= (void *)(((iaddr_t)addr1 + MEMNODE_SIZE_MASK) & ~MEMNODE_SIZE_MASK); - addr2= (void *)(((iaddr_t)addr2 + MEMNODE_SIZE_MASK) & ~MEMNODE_SIZE_MASK); - - if (bytes == 0) - return((void *)addr1); - - /* - * Locate freelist entry big enough to hold the object that is within - * the allowed address range. + * locate freelist entry big enough to hold the object. If all objects + * are the same size, this is a constant-time function. */ if (bytes <= mp->mp_Size - mp->mp_Used) { MemNode **pmn; MemNode *mn; - for (pmn = &mp->mp_First; (mn = *pmn) != NULL; pmn = &mn->mr_Next) { - int mrbytes = mn->mr_Bytes; - int offset = 0; + for (pmn = &mp->mp_First; (mn=*pmn) != NULL; pmn = &mn->mr_Next) { + if (bytes > mn->mr_Bytes) + continue; /* - * offset from base of mn to satisfy addr1. 0 or positive + * Cut a chunk of memory out of the beginning of this + * block and fixup the link appropriately. */ - if ((char *)mn < (char *)addr1) - offset = (char *)addr1 - (char *)mn; - - /* - * truncate mrbytes to satisfy addr2. mrbytes may go negative - * if the mn is beyond the last acceptable address. - */ - - if ((char *)mn + mrbytes > (char *)addr2) - mrbytes = (saddr_t)((iaddr_t)addr2 - (iaddr_t)mn); /* signed */ - - /* - * beyond last acceptable address. - * - * before first acceptable address (if offset > mrbytes, the - * second conditional will always succeed). - * - * area overlapping acceptable address range is not big enough. - */ - - if (mrbytes < 0) - break; - - if (mrbytes - offset < bytes) - continue; - - /* - * Cut a chunk of memory out of the block and fixup the link - * appropriately. - * - * If offset != 0, we have to cut a chunk out from the middle of - * the block. - */ - - if (offset) { - MemNode *mnew = (MemNode *)((char *)mn + offset); - - mnew->mr_Bytes = mn->mr_Bytes - offset; - mnew->mr_Next = mn->mr_Next; - mn->mr_Bytes = offset; - mn->mr_Next = mnew; - pmn = &mn->mr_Next; - mn = mnew; - } { char *ptr = (char *)mn; + if (mn->mr_Bytes == bytes) { *pmn = mn->mr_Next; } else { @@ -316,11 +122,14 @@ znxalloc(MemPool *mp, void *addr1, void *addr2, iaddr_t bytes) } } } + + /* + * Memory pool is full, return NULL. + */ + return(NULL); } -#endif - /* * zfree() - free previously allocated memory */ @@ -343,15 +152,8 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) if ((char *)ptr < (char *)mp->mp_Base || (char *)ptr + bytes > (char *)mp->mp_End || - ((iaddr_t)ptr & MEMNODE_SIZE_MASK) != 0 - ) { - mp->mp_Panic( - "zfree(%s,0x%08lx,%d): wild pointer", - mp->mp_Ident, - (long)ptr, - bytes - ); - } + ((iaddr_t)ptr & MEMNODE_SIZE_MASK) != 0) + panic("zfree(%p,%d): wild pointer", ptr, bytes); /* * free the segment @@ -374,13 +176,8 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) /* * range check */ - if ((char *)ptr + bytes > (char *)mn) { - mp->mp_Panic("zfree(%s,0x%08lx,%d): corrupt memlist1", - mp->mp_Ident, - (long)ptr, - bytes - ); - } + if ((char *)ptr + bytes > (char *)mn) + panic("zfree(%p,%d): corrupt memlist1",ptr, bytes); /* * merge against next area or create independant area @@ -410,13 +207,8 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) return; /* NOT REACHED */ } - if ((char *)ptr < (char *)mn + mn->mr_Bytes) { - mp->mp_Panic("zfree(%s,0x%08lx,%d): corrupt memlist2", - mp->mp_Ident, - (long)ptr, - bytes - ); - } + if ((char *)ptr < (char *)mn + mn->mr_Bytes) + panic("zfree(%p,%d): corrupt memlist2", ptr, bytes); } /* * We are beyond the last MemNode, append new MemNode. Merge against @@ -436,67 +228,6 @@ zfree(MemPool *mp, void *ptr, iaddr_t bytes) } } -#ifndef MALLOCLIB - -/* - * zallocStr() - allocate memory and copy string. - */ - -char * -zallocStr(MemPool *mp, const char *s, int slen) -{ - char *ptr; - - if (slen < 0) - slen = strlen(s); - if ((ptr = znalloc(mp, slen + 1)) != NULL) { - bcopy(s, ptr, slen); - ptr[slen] = 0; - } - return(ptr); -} - -/* - * zfreeStr() - free memory associated with an allocated string. - */ - -void -zfreeStr(MemPool *mp, char *s) -{ - zfree(mp, s, strlen(s) + 1); -} - -#endif - -/* - * zinitpool() - initialize a memory pool - */ - -void -zinitPool( - MemPool *mp, - const char *id, - void (*fpanic)(const char *ctl, ...), - int (*freclaim)(MemPool *memPool, iaddr_t bytes), - void *pBase, - iaddr_t pSize -) { - if (fpanic == NULL) - fpanic = znop; - if (freclaim == NULL) - freclaim = znot; - - if (id != (const char *)-1) - mp->mp_Ident = id; - mp->mp_Base = pBase; - mp->mp_End = (char *)pBase + pSize; - mp->mp_First = NULL; - mp->mp_Size = pSize; - mp->mp_Used = pSize; - mp->mp_Panic = fpanic; - mp->mp_Reclaim = freclaim; -} - /* * zextendPool() - extend memory pool to cover additional space. * @@ -533,27 +264,6 @@ zextendPool(MemPool *mp, void *base, iaddr_t bytes) mp->mp_Size += bytes; } -#ifndef MALLOCLIB - -/* - * zclearpool() - Free all memory associated with a memory pool, - * destroying any previous allocations. Commonly - * called afte zinitPool() to make a pool available - * for use. - */ - -void -zclearPool(MemPool *mp) -{ - MemNode *mn = mp->mp_Base; - - mn->mr_Next = NULL; - mn->mr_Bytes = mp->mp_Size; - mp->mp_First = mn; -} - -#endif - #ifdef ZALLOCDEBUG void @@ -564,7 +274,7 @@ zallocstats(MemPool *mp) int fcount = 0; MemNode *mn; - printf("Pool %s, %d bytes reserved", mp->mp_Ident, (int) mp->mp_Size); + printf("%d bytes reserved", (int) mp->mp_Size); mn = mp->mp_First; diff --git a/lib/libstand/zalloc_defs.h b/lib/libstand/zalloc_defs.h index 6a6e54de8e80..d3f46da410aa 100644 --- a/lib/libstand/zalloc_defs.h +++ b/lib/libstand/zalloc_defs.h @@ -26,19 +26,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zalloc_defs.h,v 1.1 1998/09/26 01:42:39 msmith Exp $ + * $Id: zalloc_defs.h,v 1.2 1998/09/26 10:48:50 dfr Exp $ */ /* * DEFS.H */ -#define USEPANIC /* call panic() to register errors */ #define USEGUARD /* use stard/end guard bytes */ #define USEENDGUARD #define DMALLOCDEBUG /* add debugging code to gather stats */ #define ZALLOCDEBUG -#define MALLOCLIB /* don't build unnecessary zalloc parts */ #include #include "stand.h" diff --git a/lib/libstand/zalloc_malloc.c b/lib/libstand/zalloc_malloc.c index 85d2a85ee77f..6cb4953ef312 100644 --- a/lib/libstand/zalloc_malloc.c +++ b/lib/libstand/zalloc_malloc.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: zalloc_malloc.c,v 1.1 1998/09/26 01:42:39 msmith Exp $ + * $Id: zalloc_malloc.c,v 1.2 1998/09/26 10:48:50 dfr Exp $ */ /* @@ -35,7 +35,7 @@ #include "zalloc_defs.h" -static MemPool MallocPool = INITPOOL("malloc", panic, znot); +static MemPool MallocPool; #ifdef DMALLOCDEBUG static int MallocMax; @@ -92,23 +92,13 @@ free(void *ptr) Guard *res = (void *)((char *)ptr - MALLOCALIGN); #ifdef USEGUARD - if (res->ga_Magic != GAMAGIC) { -#ifdef USEPANIC - panic("free(): guard1 fail @ %08lx\n", ptr); -#else - *(char *)0 = 1; -#endif - } + if (res->ga_Magic != GAMAGIC) + panic("free: guard1 fail @ %p", ptr); res->ga_Magic = -1; #endif #ifdef USEENDGUARD - if (*((char *)res + res->ga_Bytes - 1) != -2) { -#ifdef USEPANIC - panic("free(): guard2 fail @ %08lx + %d\n", ptr, res->ga_Bytes - MALLOCALIGN); -#else - *(char *)0 = 1; -#endif - } + if (*((char *)res + res->ga_Bytes - 1) != -2) + panic("free: guard2 fail @ %p + %d", ptr, res->ga_Bytes - MALLOCALIGN); *((char *)res + res->ga_Bytes - 1) = -1; #endif diff --git a/lib/libstand/zalloc_mem.h b/lib/libstand/zalloc_mem.h index 8655e7b6b9bc..13311943fdda 100644 --- a/lib/libstand/zalloc_mem.h +++ b/lib/libstand/zalloc_mem.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: zalloc_mem.h,v 1.1 1998/09/26 01:42:39 msmith Exp $ */ /* @@ -41,20 +41,15 @@ typedef struct MemNode { } MemNode; typedef struct MemPool { - const char *mp_Ident; void *mp_Base; void *mp_End; MemNode *mp_First; - void (*mp_Panic)(const char *ctl, ...); - int (*mp_Reclaim)(struct MemPool *memPool, iaddr_t bytes); iaddr_t mp_Size; iaddr_t mp_Used; } MemPool; #define MEMNODE_SIZE_MASK ((sizeof(MemNode) <= 8) ? 7 : 15) -#define INITPOOL(name,panic,reclaim) { name, NULL, NULL, NULL, panic, reclaim } - #define ZNOTE_FREE 0 #define ZNOTE_REUSE 1 diff --git a/lib/libstand/zalloc_protos.h b/lib/libstand/zalloc_protos.h index e49a871d2688..633453d2a621 100644 --- a/lib/libstand/zalloc_protos.h +++ b/lib/libstand/zalloc_protos.h @@ -26,21 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: zalloc_protos.h,v 1.1 1998/09/26 01:42:39 msmith Exp $ */ -Prototype struct MemPool *DummyStructMemPool; Library void *znalloc(struct MemPool *mpool, iaddr_t bytes); -Library void *zalloc(struct MemPool *mpool, iaddr_t bytes); -Library void *zallocAlign(struct MemPool *mpool, iaddr_t bytes, iaddr_t align); -Library void *zxalloc(struct MemPool *mp, void *addr1, void *addr2, iaddr_t bytes); -Library void *znxalloc(struct MemPool *mp, void *addr1, void *addr2, iaddr_t bytes); -Library char *zallocStr(struct MemPool *mpool, const char *s, int slen); Library void zfree(struct MemPool *mpool, void *ptr, iaddr_t bytes); -Library void zfreeStr(struct MemPool *mpool, char *s); -Library void zinitPool(struct MemPool *mp, const char *id, void (*fpanic)(const char *ctl, ...), int (*freclaim)(struct MemPool *memPool, iaddr_t bytes), void *pBase, iaddr_t pSize); Library void zextendPool(MemPool *mp, void *base, iaddr_t bytes); -Library void zclearPool(struct MemPool *mp); -Library void znop(const char *ctl, ...); -Library int znot(struct MemPool *memPool, iaddr_t bytes); Library void zallocstats(struct MemPool *mp);