--- ray/src/hd/holofile.c	1998/08/12 17:53:59	3.23
+++ ray/src/hd/holofile.c	1998/11/04 16:44:16	3.27
@@ -16,7 +16,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #define CACHESIZE	16	/* default cache size (Mbytes, 0==inf) */
 #endif
 #ifndef FREEBEAMS
-#define FREEBEAMS	1024	/* maximum beams to free at a time */
+#define FREEBEAMS	1500	/* maximum beams to free at a time */
 #endif
 #ifndef PCTFREE
 #define PCTFREE		15	/* maximum fraction to free (%) */
@@ -48,18 +48,36 @@ static struct fraglist {
 static int	nhdfragls;	/* size of hdfragl array */
 
 
+char *
+hdrealloc(ptr, siz, rout)	/* (re)allocate memory, retry then error */
+char	*ptr;
+unsigned	siz;
+char	*rout;
+{
+	register char	*newp;
+					/* call malloc/realloc */
+	if (ptr == NULL) newp = (char *)malloc(siz);
+	else newp = (char *)realloc(ptr, siz);
+					/* check success */
+	if (newp == NULL && rout != NULL) {
+		hdfreecache(25, NULL);	/* free some memory */
+		errno = 0;		/* retry */
+		newp = hdrealloc(ptr, siz, NULL);
+		if (newp == NULL) {	/* give up and report error */
+			sprintf(errmsg, "out of memory in %s", rout);
+			error(SYSTEM, errmsg);
+		}
+	}
+	return(newp);
+}
+
+
 hdattach(fd)		/* start tracking file fragments for some section */
 register int	fd;
 {
 	if (fd >= nhdfragls) {
-		if (nhdfragls)
-			hdfragl = (struct fraglist *)realloc((char *)hdfragl,
-					(fd+1)*sizeof(struct fraglist));
-		else
-			hdfragl = (struct fraglist *)malloc(
-					(fd+1)*sizeof(struct fraglist));
-		if (hdfragl == NULL)
-			error(SYSTEM, "out of memory in hdattach");
+		hdfragl = (struct fraglist *)hdrealloc((char *)hdfragl,
+				(fd+1)*sizeof(struct fraglist), "hdattach");
 		bzero((char *)(hdfragl+nhdfragls),
 				(fd+1-nhdfragls)*sizeof(struct fraglist));
 		nhdfragls = fd+1;
@@ -148,7 +166,7 @@ HDGRID	*hproto;		/* holodeck section grid */
 	biglob(hp)->nrd = rtrunc = 0;
 	for (n = hproto == NULL ? nbeams(hp) : 0; n > 0; n--)
 		if (hp->bi[n].nrd)
-			if (hp->bi[n].fo + hp->bi[n].nrd > fpos) {
+			if (hp->bi[n].fo+hp->bi[n].nrd*sizeof(RAYVAL) > fpos) {
 				rtrunc += hp->bi[n].nrd;
 				hp->bi[n].nrd = 0;
 			} else
@@ -292,13 +310,12 @@ int	nr;			/* number of new rays desired */
 		hp->bl[i]->tick = hdclock;	/* preempt swap */
 	if (hdcachesize > 0 && hdmemuse(0) >= hdcachesize)
 		hdfreecache(PCTFREE, NULL);	/* free some space */
-	errno = 0;
 	if (hp->bl[i] == NULL) {		/* allocate (and load) */
 		n = hp->bi[i].nrd + nr;
-		if ((hp->bl[i] = (BEAM *)malloc(hdbsiz(n))) == NULL)
-			goto memerr;
+		hp->bl[i] = (BEAM *)hdrealloc(NULL, hdbsiz(n), "hdnewrays");
 		blglob(hp)->nrm += n;
 		if (n = hp->bl[i]->nrm = hp->bi[i].nrd) {
+			errno = 0;
 			if (lseek(hp->fd, hp->bi[i].fo, 0) < 0)
 				error(SYSTEM, "seek error on holodeck file");
 			n *= sizeof(RAYVAL);
@@ -307,20 +324,15 @@ int	nr;			/* number of new rays desired */
 				"error reading beam from holodeck file");
 		}
 	} else {				/* just grow in memory */
-		hp->bl[i] = (BEAM *)realloc( (char *)hp->bl[i],
-				hdbsiz(hp->bl[i]->nrm + nr) );
-		if (hp->bl[i] == NULL)
-			goto memerr;
+		hp->bl[i] = (BEAM *)hdrealloc((char *)hp->bl[i],
+				hdbsiz(hp->bl[i]->nrm + nr), "hdnewrays");
 		blglob(hp)->nrm += nr;
 	}
 	p = hdbray(hp->bl[i]) + hp->bl[i]->nrm;
 	hp->bl[i]->nrm += nr;			/* update in-core structure */
 	bzero((char *)p, nr*sizeof(RAYVAL));
-	hp->bl[i]->tick = hdclock;		/* update LRU clock */
-	blglob(hp)->tick = hdclock++;
+	blglob(hp)->tick = hp->bl[i]->tick = hdclock++;	/* update LRU clock */
 	return(p);				/* point to new rays */
-memerr:
-	error(SYSTEM, "out of memory in hdnewrays");
 }
 
 
@@ -338,18 +350,16 @@ register int	i;
 			return(NULL);
 		if (hdcachesize > 0 && hdmemuse(0) >= hdcachesize)
 			hdfreecache(PCTFREE, NULL);	/* get free space */
-		errno = 0;
-		if ((hp->bl[i] = (BEAM *)malloc(hdbsiz(n))) == NULL)
-			error(SYSTEM, "cannot allocate memory for beam");
+		hp->bl[i] = (BEAM *)hdrealloc(NULL, hdbsiz(n), "hdgetbeam");
 		blglob(hp)->nrm += hp->bl[i]->nrm = n;
+		errno = 0;
 		if (lseek(hp->fd, hp->bi[i].fo, 0) < 0)
 			error(SYSTEM, "seek error on holodeck file");
 		n *= sizeof(RAYVAL);
 		if (read(hp->fd, (char *)hdbray(hp->bl[i]), n) != n)
 			error(SYSTEM, "error reading beam from holodeck file");
 	}
-	hp->bl[i]->tick = hdclock;	/* update LRU clock */
-	blglob(hp)->tick = hdclock++;
+	blglob(hp)->tick = hp->bl[i]->tick = hdclock++;	/* update LRU clock */
 	return(hp->bl[i]);
 }
 
@@ -383,6 +393,7 @@ int	(*bf)();		/* callback function (optional) */
 	register BEAM	*bp;
 	register int	i;
 					/* precheck consistency */
+	if (n <= 0) return;
 	for (i = n; i--; )
 		if (hb[i].h == NULL || hb[i].b < 1 | hb[i].b > nbeams(hb[i].h))
 			error(CONSISTENCY, "bad beam in hdloadbeams");
@@ -448,13 +459,17 @@ register BEAMI	*bi;
 		f->nfrags--;
 #endif
 	if (j % FRAGBLK == 0) {		/* more free list space */
+		register BEAMI	*newp;
 		if (f->fi == NULL)
-			f->fi = (BEAMI *)malloc(FRAGBLK*sizeof(BEAMI));
+			newp = (BEAMI *)malloc((j+FRAGBLK)*sizeof(BEAMI));
 		else
-			f->fi = (BEAMI *)realloc((char *)f->fi,
+			newp = (BEAMI *)realloc((char *)f->fi,
 					(j+FRAGBLK)*sizeof(BEAMI));
-		if (f->fi == NULL)
-			error(SYSTEM, "out of memory in hdfreefrag");
+		if (newp == NULL) {
+			f->nfrags--;	/* graceful failure */
+			return;
+		}
+		f->fi = newp;
 	}
 	for ( ; ; j--) {		/* insert in descending list */
 		if (!j || bi->fo < f->fi[j-1].fo) {
@@ -680,6 +695,11 @@ register HOLO	*honly;			/* NULL means check all */
 	int	freetarget;
 	int	n;
 	register int	i;
+#ifdef DEBUG
+	unsigned	membefore;
+
+	membefore = hdmemuse(0);
+#endif
 						/* compute free target */
 	freetarget = (honly != NULL) ? blglob(honly)->nrm :
 			hdmemuse(0)/sizeof(RAYVAL) ;
@@ -700,6 +720,12 @@ register HOLO	*honly;			/* NULL means check all */
 			break;
 	}
 	hdsync(honly, 0);	/* synchronize directories as necessary */
+#ifdef DEBUG
+	sprintf(errmsg,
+	"%dK before, %dK after hdfreecache (%dK total), %d rays short\n",
+		membefore>>10, hdmemuse(0)>>10, hdmemuse(1)>>10, freetarget);
+	wputs(errmsg);
+#endif
 	return(-freetarget);	/* return how far past goal we went */
 }
 
@@ -712,10 +738,13 @@ register HOLO	*hp;		/* NULL means clean up all */
 	if (hp == NULL) {		/* NULL means clean up everything */
 		while (hdlist[0] != NULL)
 			hddone(hdlist[0]);
+		free((char *)hdfragl);
+		hdfragl = NULL; nhdfragls = 0;
 		return;
 	}
 					/* flush all data and free memory */
-	hdflush(hp);
+	hdfreebeam(hp, 0);
+	hdsync(hp, 0);
 					/* release fragment resources */
 	hdrelease(hp->fd);
 					/* remove hp from active list */