--- ray/src/common/malloc.c 1991/08/26 10:12:24 1.14 +++ ray/src/common/malloc.c 2003/05/13 17:58:32 2.15 @@ -1,9 +1,6 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: malloc.c,v 2.15 2003/05/13 17:58:32 greg Exp $"; #endif - /* * Fast malloc for memory hogs and VM environments. * Performs a minimum of searching through free lists. @@ -22,11 +19,18 @@ static char SCCSid[] = "$SunId$ LBL"; * Greg Ward Lawrence Berkeley Laboratory */ +#include "copyright.h" + #include +#ifndef BSD +#define bcopy(s,d,n) (void)memcpy(d,s,n) +#define bzero(d,n) (void)memset(d,0,n) +#endif + #ifdef MSTATS #include -static unsigned b_nsbrked = 0; +static unsigned b_nsbrked = 0; static unsigned b_nalloced = 0; static unsigned b_nfreed = 0; static unsigned b_nscrounged = 0; @@ -38,15 +42,13 @@ static unsigned m_nwasted = 0; #define NULL 0 #endif -#ifndef ALIGN -#define ALIGN int /* align type */ +#ifndef ALIGNT +#define ALIGNT int /* align type */ #endif -#define BYTES_WORD sizeof(ALIGN) +#define BYTES_WORD sizeof(ALIGNT) +#ifndef MAXINCR #define MAXINCR (1<<16) /* largest sbrk(2) increment */ - -#ifdef NOVMEM -#define getpagesize() 1024 #endif /* malloc free lists */ typedef union m_head { @@ -55,7 +57,7 @@ typedef union m_head { short magic; short bucket; } a; - ALIGN dummy; + ALIGNT dummy; } M_HEAD; #define MAGIC 0x1a2 /* magic number for allocated memory */ @@ -65,10 +67,14 @@ typedef union m_head { static M_HEAD *free_list[NBUCKETS]; -static ALIGN dummy_mem; +static ALIGNT dummy_mem; +static char *memlim[2]; + #define DUMMYLOC ((char *)&dummy_mem) +#define BADPTR(p) ((p) < memlim[0] | (p) >= memlim[1]) + #ifdef MCOMP /* memory compaction routines */ static char seedtab[1024]; /* seed for compaction table */ @@ -152,7 +158,8 @@ unsigned *np; for ( ; ; ) { /* compact free lists */ - compactfree(); + while (compactfree()) + ; /* find largest block */ tab = mtab(&cptab); tablen = mtablen(&cptab); big = tab; @@ -165,7 +172,7 @@ unsigned *np; big->siz = 0; /* remove from table */ return(big->ptr); /* return it */ } - if (mtablen(big) < tablen+1) { + if (mtablen(big) <= tablen) { *np = 0; /* cannot grow table */ return(NULL); /* report failure */ } @@ -175,17 +182,10 @@ unsigned *np; cptab.ptr = big->ptr; cptab.siz = big->siz; big->siz = 0; /* clear and copy */ -#ifdef BSD bcopy((char *)tab, (char *)(mtab(&cptab)+1), tablen*sizeof(struct mblk)); bzero((char *)(mtab(&cptab)+tablen+1), (mtablen(&cptab)-tablen-1)*sizeof(struct mblk)); -#else - (void)memcpy((char *)(mtab(&cptab)+1), (char *)tab, - tablen*sizeof(struct mblk)); - memset((char *)(mtab(&cptab)+tablen+1), 0, - (mtablen(&cptab)-tablen-1)*sizeof(struct mblk)); -#endif } /* next round */ } #endif /* MCOMP */ @@ -235,17 +235,22 @@ register unsigned n; pagesz = amnt = getpagesize(); nrem = (int)sbrk(0); /* page align break */ nrem = pagesz - (nrem&(pagesz-1)); - bpos = sbrk(nrem); /* word aligned! */ + bpos = sbrk(nrem); if ((int)bpos == -1) return(NULL); #ifdef MSTATS b_nsbrked += nrem; #endif + bpos += nrem & (BYTES_WORD-1); /* align pointer */ + nrem &= ~(BYTES_WORD-1); + memlim[0] = bpos; + memlim[1] = bpos + nrem; } n = (n+(BYTES_WORD-1))&~(BYTES_WORD-1); /* word align rqst. */ if (n > nrem) { /* need more core */ + tryagain: if (n > amnt) { /* big chunk */ thisamnt = (n+(pagesz-1))&~(pagesz-1); if (thisamnt <= MAXINCR) /* increase amnt */ @@ -254,10 +259,17 @@ register unsigned n; thisamnt = amnt; p = sbrk(thisamnt); if ((int)p == -1) { /* uh-oh, ENOMEM */ - thisamnt = n; /* search free lists */ - p = mscrounge(&thisamnt); - if (p == NULL) /* we're really out */ + errno = 0; /* call cavalry */ + if (thisamnt >= n+pagesz) { + amnt = pagesz; /* minimize request */ + goto tryagain; + } + thisamnt = n; + p = mscrounge(&thisamnt); /* search free lists */ + if (p == NULL) { /* we're really out */ + errno = ENOMEM; return(NULL); + } } #ifdef MSTATS else b_nsbrked += thisamnt; @@ -268,6 +280,10 @@ register unsigned n; nrem = thisamnt; } else /* otherwise tack on */ nrem += thisamnt; + if (bpos < memlim[0]) + memlim[0] = bpos; + if (bpos + nrem > memlim[1]) + memlim[1] = bpos + nrem; } p = bpos; bpos += n; /* advance */ @@ -286,6 +302,8 @@ register unsigned n; register int bucket; register unsigned bsiz; + if (n < 1< memlim[1]) + memlim[1] = p + n; /* fill big buckets first */ for (bucket = NBUCKETS-1, bsiz = 1<<(NBUCKETS-1); bucket >= FIRSTBUCKET; bucket--, bsiz >>= 1) @@ -311,7 +333,6 @@ char * malloc(n) /* allocate n bytes of memory */ unsigned n; { - extern int errno; register M_HEAD *mp; register int bucket; register unsigned bsiz; @@ -353,20 +374,17 @@ unsigned n; char *p; register unsigned on; /* get old size */ - if (op != NULL && op != DUMMYLOC && ((M_HEAD *)op-1)->a.magic == MAGIC) + if (op != DUMMYLOC && !BADPTR(op) && + ((M_HEAD *)op-1)->a.magic == MAGIC) on = 1 << ((M_HEAD *)op-1)->a.bucket; else on = 0; if (n <= on && (n > on>>1 || on == 1<on ? on : n); -#else - (void)memcpy(p, op, n>on ? on : n); -#endif free(op); } return(p); @@ -379,34 +397,26 @@ char *p; register M_HEAD *mp; register int bucket; - if (p == NULL || p == DUMMYLOC) + if (p == DUMMYLOC) return(1); + if (BADPTR(p)) + goto invalid; mp = (M_HEAD *)p - 1; if (mp->a.magic != MAGIC) /* sanity check */ - return(0); + goto invalid; bucket = mp->a.bucket; + if (bucket < FIRSTBUCKET | bucket >= NBUCKETS) + goto invalid; mp->next = free_list[bucket]; free_list[bucket] = mp; #ifdef MSTATS m_nfreed += (1 << bucket) + sizeof(M_HEAD); #endif return(1); +invalid: + errno = EINVAL; + return(0); } - - -#ifndef NOVMEM -#ifndef BSD -#include -int -getpagesize() /* use SYSV var structure to get page size */ -{ - struct var v; - - uvar(&v); - return(1 << v.v_pageshift); -} -#endif -#endif #ifdef MSTATS