--- ray/src/common/malloc.c	1992/09/04 18:36:05	2.7
+++ ray/src/common/malloc.c	2003/02/22 02:07:22	2.12
@@ -1,9 +1,6 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: malloc.c,v 2.12 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Fast malloc for memory hogs and VM environments.
  * Performs a minimum of searching through free lists.
@@ -22,14 +19,68 @@ static char SCCSid[] = "$SunId$ LBL";
  *	Greg Ward	Lawrence Berkeley Laboratory
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
 #include  <errno.h>
 
-extern int	errno;
-
 #ifndef  BSD
 #define  bcopy(s,d,n)		(void)memcpy(d,s,n)
 #define  bzero(d,n)		(void)memset(d,0,n)
-extern char  *memcpy(), *memset();
 #endif
 
 #ifdef MSTATS
@@ -46,10 +97,10 @@ 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 */
@@ -61,7 +112,7 @@ typedef union m_head {
 		short		magic;
 		short		bucket;
 	}	a;
-	ALIGN		dummy;
+	ALIGNT		dummy;
 } M_HEAD;
 
 #define MAGIC		0x1a2		/* magic number for allocated memory */
@@ -71,7 +122,7 @@ typedef union m_head {
 
 static M_HEAD	*free_list[NBUCKETS];
 
-static ALIGN	dummy_mem;
+static ALIGNT	dummy_mem;
 
 static char	*memlim[2];
 
@@ -162,7 +213,8 @@ unsigned	*np;
 
 	for ( ; ; ) {
 					/* compact free lists */
-		compactfree();
+		while (compactfree())
+			;
 					/* find largest block */
 		tab = mtab(&cptab); tablen = mtablen(&cptab);
 		big = tab;
@@ -253,6 +305,7 @@ register unsigned  n;
 	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 */
@@ -261,10 +314,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;
@@ -297,7 +357,7 @@ register unsigned  n;
 	register int	bucket;
 	register unsigned	bsiz;
 
-	if (n < 1<<FIRSTBUCKET)
+	if (n < 1<<FIRSTBUCKET || p == NULL)
 		return;
 #ifdef MSTATS
 	b_nfreed += n;