--- ray/src/hd/holofile.c	1997/12/11 19:57:58	3.11
+++ ray/src/hd/holofile.c	1998/09/15 14:26:23	3.24
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -16,54 +16,56 @@ static char SCCSid[] = "$SunId$ SGI";
 #define CACHESIZE	16	/* default cache size (Mbytes, 0==inf) */
 #endif
 #ifndef FREEBEAMS
-#define FREEBEAMS	512	/* maximum beams to free at a time */
+#define FREEBEAMS	1024	/* maximum beams to free at a time */
 #endif
 #ifndef PCTFREE
-#define PCTFREE		20	/* maximum fraction to free (%) */
+#define PCTFREE		15	/* maximum fraction to free (%) */
 #endif
+#ifndef MAXFRAG
+#define MAXFRAG		32767	/* maximum fragments/file to track (0==inf) */
+#endif
 
-/* define MAXFRAG if you want to limit fragment tracking memory */
-
 #ifndef BSD
 #define write	writebuf	/* safe i/o routines */
 #define read	readbuf
 #endif
 
-#define FRAGBLK		64	/* number of fragments to allocate at a time */
+#define FRAGBLK		256	/* number of fragments to allocate at a time */
 
-int	hdcachesize = CACHESIZE*1024*1024;	/* target cache size (bytes) */
+unsigned	hdcachesize = CACHESIZE*1024*1024;	/* target cache size */
 unsigned long	hdclock;	/* clock value */
 
 HOLO	*hdlist[HDMAX+1];	/* holodeck pointers (NULL term.) */
 
-static struct fragment {
+static struct fraglist {
 	short	nlinks;		/* number of holodeck sections using us */
-	short	nfrags;		/* number of known fragments */
+	short	writerr;	/* write error encountered */
+	int	nfrags;		/* number of known fragments */
 	BEAMI	*fi;		/* fragments, descending file position */
 	long	flen;		/* last known file length */
-} *hdfrag;		/* fragment lists, indexed by file descriptor */
+} *hdfragl;		/* fragment lists, indexed by file descriptor */
 
-static int	nhdfrags;	/* size of hdfrag array */
+static int	nhdfragls;	/* size of hdfragl array */
 
 
 hdattach(fd)		/* start tracking file fragments for some section */
 register int	fd;
 {
-	if (fd >= nhdfrags) {
-		if (nhdfrags)
-			hdfrag = (struct fragment *)realloc((char *)hdfrag,
-					(fd+1)*sizeof(struct fragment));
+	if (fd >= nhdfragls) {
+		if (nhdfragls)
+			hdfragl = (struct fraglist *)realloc((char *)hdfragl,
+					(fd+1)*sizeof(struct fraglist));
 		else
-			hdfrag = (struct fragment *)malloc(
-					(fd+1)*sizeof(struct fragment));
-		if (hdfrag == NULL)
+			hdfragl = (struct fraglist *)malloc(
+					(fd+1)*sizeof(struct fraglist));
+		if (hdfragl == NULL)
 			error(SYSTEM, "out of memory in hdattach");
-		bzero((char *)(hdfrag+nhdfrags),
-				(fd+1-nhdfrags)*sizeof(struct fragment));
-		nhdfrags = fd+1;
+		bzero((char *)(hdfragl+nhdfragls),
+				(fd+1-nhdfragls)*sizeof(struct fraglist));
+		nhdfragls = fd+1;
 	}
-	hdfrag[fd].nlinks++;
-	hdfrag[fd].flen = lseek(fd, 0L, 2);	/* get file length */
+	hdfragl[fd].nlinks++;
+	hdfragl[fd].flen = lseek(fd, 0L, 2);	/* get file length */
 }
 
 
@@ -73,12 +75,12 @@ register int	fd;
 hdrelease(fd)		/* stop tracking file fragments for some section */
 register int	fd;
 {
-	if (fd < 0 | fd >= nhdfrags || !hdfrag[fd].nlinks)
+	if (fd < 0 | fd >= nhdfragls || !hdfragl[fd].nlinks)
 		return;
-	if (!--hdfrag[fd].nlinks && hdfrag[fd].nfrags) {
-		free((char *)hdfrag[fd].fi);
-		hdfrag[fd].fi = NULL;
-		hdfrag[fd].nfrags = 0;
+	if (!--hdfragl[fd].nlinks && hdfragl[fd].nfrags) {
+		free((char *)hdfragl[fd].fi);
+		hdfragl[fd].fi = NULL;
+		hdfragl[fd].nfrags = 0;
 	}
 }
 
@@ -103,6 +105,7 @@ hdinit(fd, hproto)	/* initialize a holodeck section in
 int	fd;			/* corresponding file descriptor */
 HDGRID	*hproto;		/* holodeck section grid */
 {
+	long	rtrunc;
 	long	fpos;
 	register HOLO	*hp;
 	register int	n;
@@ -124,7 +127,7 @@ HDGRID	*hproto;		/* holodeck section grid */
 			error(SYSTEM, "failure loading holodeck directory");
 						/* check that it's clean */
 		if (hp->bi[nbeams(hp)].fo < 0)
-			error(USER, "dirty holodeck section");
+			error(WARNING, "dirty holodeck section");
 	} else {			/* assume we're creating it */
 		if ((hp = hdalloc(hproto)) == NULL)
 			goto memerr;
@@ -138,17 +141,29 @@ HDGRID	*hproto;		/* holodeck section grid */
 	hp->fd = fd;	
 	hp->dirty = 0;
 	biglob(hp)->fo = fpos + sizeof(HDGRID);
-	biglob(hp)->nrd = 0;		/* count rays on disk */
-	for (n = nbeams(hp); n > 0; n--)
-		biglob(hp)->nrd += hp->bi[n].nrd;
+					/* start tracking fragments */
+	hdattach(fd);
+					/* check rays on disk */
+	fpos = hdfilen(fd);
+	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) {
+				rtrunc += hp->bi[n].nrd;
+				hp->bi[n].nrd = 0;
+			} else
+				biglob(hp)->nrd += hp->bi[n].nrd;
+	if (rtrunc) {
+		sprintf(errmsg, "truncated section, %ld rays lost (%.1f%%)",
+				rtrunc, 100.*rtrunc/(rtrunc+biglob(hp)->nrd));
+		error(WARNING, errmsg);
+	}
 					/* add to holodeck list */
 	for (n = 0; n < HDMAX; n++)
 		if (hdlist[n] == NULL) {
 			hdlist[n] = hp;
 			break;
 		}
-					/* start tracking fragments (last) */
-	hdattach(fd);
 					/* all done */
 	return(hp);
 memerr:
@@ -157,18 +172,23 @@ memerr:
 
 
 int
-hdsync(hp)			/* update directory on disk if necessary */
+hdsync(hp, all)			/* update beams and directory on disk */
 register HOLO	*hp;
+int	all;
 {
 	register int	j, n;
 
-	if (hp == NULL) {		/* do all */
+	if (hp == NULL) {		/* do all holodecks */
 		n = 0;
 		for (j = 0; hdlist[j] != NULL; j++)
-			n += hdsync(hdlist[j]);
+			n += hdsync(hdlist[j], all);
 		return(n);
 	}
-	if (!hp->dirty)			/* check first */
+					/* sync the beams */
+	for (j = (all ? nbeams(hp) : 0); j > 0; j--)
+		if (hp->bl[j] != NULL)
+			hdsyncbeam(hp, j);
+	if (!hp->dirty)			/* directory clean? */
 		return(0);
 	errno = 0;
 	if (lseek(hp->fd, biglob(hp)->fo, 0) < 0)
@@ -181,7 +201,7 @@ register HOLO	*hp;
 }
 
 
-long
+unsigned
 hdmemuse(all)		/* return memory usage (in bytes) */
 int	all;			/* include overhead (painful) */
 {
@@ -200,11 +220,11 @@ int	all;			/* include overhead (painful) */
 		}
 	}
 	if (all)
-		for (j = 0; j < nhdfrags; j++) {
-			total += sizeof(struct fragment);
-			if (hdfrag[j].nfrags)
+		for (j = 0; j < nhdfragls; j++) {
+			total += sizeof(struct fraglist);
+			if (hdfragl[j].nfrags)
 				total += FRAGBLK*sizeof(BEAMI) *
-					((hdfrag[j].nfrags-1)/FRAGBLK + 1) ;
+					((hdfragl[j].nfrags-1)/FRAGBLK + 1) ;
 		}
 	return(total);
 }
@@ -218,14 +238,14 @@ int	fd;
 
 	if (fd < 0)
 		return(-1);
-	if (fd >= nhdfrags || !hdfrag[fd].nlinks) {
+	if (fd >= nhdfragls || !hdfragl[fd].nlinks) {
 		if ((fpos = lseek(fd, 0L, 1)) < 0)
 			return(-1);
 		flen = lseek(fd, 0L, 2);
 		lseek(fd, fpos, 0);
 		return(flen);
 	}
-	return(hdfrag[fd].flen);
+	return(hdfragl[fd].flen);
 }
 
 
@@ -296,8 +316,8 @@ int	nr;			/* number of new rays desired */
 	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;
+	hp->bl[i]->tick = hdclock;		/* update LRU clock */
+	blglob(hp)->tick = hdclock++;
 	return(p);				/* point to new rays */
 memerr:
 	error(SYSTEM, "out of memory in hdnewrays");
@@ -328,112 +348,211 @@ register int	i;
 		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;
+	hp->bl[i]->tick = hdclock;	/* update LRU clock */
+	blglob(hp)->tick = hdclock++;
 	return(hp->bl[i]);
 }
 
 
 int
-hdsyncbi(hp, i)			/* sync beam in memory with beam on disk */
-register HOLO	*hp;
-register int	i;
+hdfilord(hb1, hb2)	/* order beams for quick loading */
+register HDBEAMI	*hb1, *hb2;
 {
-	unsigned int	nrays = hp->bl[i]->nrm;
-	long	nfo;
-	unsigned int	n;
-					/* is current fragment OK? */
-	if (nrays == hp->bi[i].nrd)
-		return(0);
-					/* check file status */
-	if (hp->dirty < 0)
+	register long	c;
+				/* residents go first */
+	if (hb2->h->bl[hb2->b] != NULL)
+		return(hb1->h->bl[hb1->b] == NULL);
+	if (hb1->h->bl[hb1->b] != NULL)
 		return(-1);
+				/* otherwise sort by file descriptor */
+	if ((c = hb1->h->fd - hb2->h->fd))
+		return(c);
+				/* then by position in file */
+	c = hb1->h->bi[hb1->b].fo - hb2->h->bi[hb2->b].fo;
+	return(c > 0 ? 1 : c < 0 ? -1 : 0);
+}
 
-	if (hp->fd >= nhdfrags || !hdfrag[hp->fd].nlinks) /* untracked */
-		hp->bi[i].fo = lseek(hp->fd, 0L, 2);
 
-	else if (hp->bi[i].fo + hp->bi[i].nrd*sizeof(RAYVAL) ==
-			hdfrag[hp->fd].flen)		/* EOF special case */
-		hdfrag[hp->fd].flen = (nfo=hp->bi[i].fo) + nrays*sizeof(RAYVAL);
+hdloadbeams(hb, n, bf)	/* load a list of beams in optimal order */
+register HDBEAMI	*hb;	/* list gets sorted by hdfilord() */
+int	n;			/* list length */
+int	(*bf)();		/* callback function (optional) */
+{
+	unsigned	origcachesize, memuse;
+	int	bytesloaded, needbytes, bytes2free;
+	register BEAM	*bp;
+	register int	i;
+					/* precheck consistency */
+	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");
+					/* sort list for optimal access */
+	qsort((char *)hb, n, sizeof(HDBEAMI), hdfilord);
+	bytesloaded = 0;		/* run through loaded beams */
+	for ( ; n && (bp = hb->h->bl[hb->b]) != NULL; n--, hb++) {
+		bp->tick = hdclock;	/* preempt swap */
+		bytesloaded += bp->nrm;
+		if (bf != NULL)
+			(*bf)(bp, hb);
+	}
+	bytesloaded *= sizeof(RAYVAL);
+	if ((origcachesize = hdcachesize) > 0) {
+		needbytes = 0;		/* figure out memory needs */
+		for (i = n; i--; )
+			needbytes += hb[i].h->bi[hb[i].b].nrd;
+		needbytes *= sizeof(RAYVAL);
+		do {				/* free enough memory */
+			memuse = hdmemuse(0);
+			bytes2free = needbytes - (int)(hdcachesize-memuse);
+			if (bytes2free > (int)(memuse - bytesloaded))
+				bytes2free = memuse - bytesloaded;
+		} while (bytes2free > 0 &&
+				hdfreecache(100*bytes2free/memuse, NULL) < 0);
+		hdcachesize = 0;		/* load beams w/o swap */
+	}
+	for (i = 0; i < n; i++)
+		if ((bp = hdgetbeam(hb[i].h, hb[i].b)) != NULL && bf != NULL)
+			(*bf)(bp, hb+i);
+	hdcachesize = origcachesize;	/* resume dynamic swapping */
+}
 
-	else {						/* general case */
-		register struct fragment	*f = &hdfrag[hp->fd];
-		register int	j, k;
-					/* relinquish old fragment */
-		if (hp->bi[i].nrd) {
-			j = f->nfrags++;
-#ifdef MAXFRAG
-			if (j >= MAXFRAG-1)
-				f->nfrags--;
+
+hdfreefrag(fd, bi)			/* free a file fragment */
+int	fd;
+register BEAMI	*bi;
+{
+	register struct fraglist	*f;
+	register int	j, k;
+
+	if (bi->nrd == 0)
+		return;
+#ifdef DEBUG
+	if (fd < 0 | fd >= nhdfragls || !hdfragl[fd].nlinks)
+		error(CONSISTENCY, "bad file descriptor in hdfreefrag");
 #endif
-			if (j % FRAGBLK == 0) {		/* more frag. space */
-				if (f->fi == NULL)
-					f->fi = (BEAMI *)malloc(
-							FRAGBLK*sizeof(BEAMI));
-				else
-					f->fi = (BEAMI *)realloc((char *)f->fi,
-						(j+FRAGBLK)*sizeof(BEAMI));
-				if (f->fi == NULL)
-					error(SYSTEM,
-						"out of memory in hdsyncbi");
-			}
-			for ( ; ; j--) {	/* insert in descending list */
-				if (!j || hp->bi[i].fo < f->fi[j-1].fo) {
-					f->fi[j].fo = hp->bi[i].fo;
-					f->fi[j].nrd = hp->bi[i].nrd;
-					break;
-				}
-				copystruct(f->fi+j, f->fi+j-1);
-			}
+	f = &hdfragl[fd];
+	if (f->nfrags % FRAGBLK == 0) {	/* delete empty remnants */
+		for (j = k = 0; k < f->nfrags; j++, k++) {
+			while (f->fi[k].nrd == 0)
+				if (++k >= f->nfrags)
+					goto endloop;
+			if (k > j)
+				copystruct(f->fi+j, f->fi+k);
+		}
+	endloop:
+		f->nfrags = j;
+	}
+	j = f->nfrags++;		/* allocate a slot in free list */
+#if MAXFRAG
+	if (j >= MAXFRAG-1)
+		f->nfrags--;
+#endif
+	if (j % FRAGBLK == 0) {		/* more free list space */
+		if (f->fi == NULL)
+			f->fi = (BEAMI *)malloc(FRAGBLK*sizeof(BEAMI));
+		else
+			f->fi = (BEAMI *)realloc((char *)f->fi,
+					(j+FRAGBLK)*sizeof(BEAMI));
+		if (f->fi == NULL)
+			error(SYSTEM, "out of memory in hdfreefrag");
+	}
+	for ( ; ; j--) {		/* insert in descending list */
+		if (!j || bi->fo < f->fi[j-1].fo) {
+			f->fi[j].fo = bi->fo;
+			f->fi[j].nrd = bi->nrd;
+			break;
+		}
+		copystruct(f->fi+j, f->fi+(j-1));
+	}
 					/* coalesce adjacent fragments */
-			for (j = k = 0; k < f->nfrags; j++, k++) {
-				if (k > j)
-					copystruct(f->fi+j, f->fi+k);
-				while (k+1 < f->nfrags && f->fi[k+1].fo +
-						f->fi[k+1].nrd*sizeof(RAYVAL)
-							== f->fi[j].fo) {
-					f->fi[j].fo -=
-						f->fi[++k].nrd*sizeof(RAYVAL);
-					f->fi[j].nrd += f->fi[k].nrd;
-				}
+						/* successors never empty */
+	if (j && f->fi[j-1].fo == f->fi[j].fo + f->fi[j].nrd*sizeof(RAYVAL)) {
+		f->fi[j].nrd += f->fi[j-1].nrd;
+		f->fi[j-1].nrd = 0;
+	}
+	for (k = j+1; k < f->nfrags; k++)	/* get non-empty predecessor */
+		if (f->fi[k].nrd) {
+			if (f->fi[j].fo == f->fi[k].fo +
+					f->fi[k].nrd*sizeof(RAYVAL)) {
+				f->fi[k].nrd += f->fi[j].nrd;
+				f->fi[j].nrd = 0;
 			}
-			f->nfrags = j;
+			break;
 		}
-		k = -1;			/* find closest-sized fragment */
-		for (j = nrays ? f->nfrags : 0; j-- > 0; )
-			if (f->fi[j].nrd >= nrays &&
-					(k < 0 || f->fi[j].nrd < f->fi[k].nrd))
-				if (f->fi[k=j].nrd == nrays)
-					break;
-		if (k < 0) {		/* no fragment -- extend file */
-			nfo = f->flen;
-			f->flen += nrays*sizeof(RAYVAL);
-		} else {		/* else use fragment */
-			nfo = f->fi[k].fo;
-			if (f->fi[k].nrd == nrays) {	/* delete fragment */
-				f->nfrags--;
-				for (j = k; j < f->nfrags; j++)
-					copystruct(f->fi+j, f->fi+j+1);
-			} else {			/* else shrink it */
-				f->fi[k].fo += nrays*sizeof(RAYVAL);
-				f->fi[k].nrd -= nrays;
-			}
-		}
+}
+
+
+long
+hdallocfrag(fd, nrays)		/* allocate a file fragment */
+int	fd;
+unsigned int4	nrays;
+{
+	register struct fraglist	*f;
+	register int	j, k;
+	long	nfo;
+
+	if (nrays == 0)
+		return(-1L);
+#ifdef DEBUG
+	if (fd < 0 | fd >= nhdfragls || !hdfragl[fd].nlinks)
+		error(CONSISTENCY, "bad file descriptor in hdallocfrag");
+#endif
+	f = &hdfragl[fd];
+	k = -1;				/* find closest-sized fragment */
+	for (j = f->nfrags; j-- > 0; )
+		if (f->fi[j].nrd >= nrays &&
+				(k < 0 || f->fi[j].nrd < f->fi[k].nrd))
+			if (f->fi[k=j].nrd == nrays)
+				break;
+	if (k < 0) {			/* no fragment -- extend file */
+		nfo = f->flen;
+		f->flen += nrays*sizeof(RAYVAL);
+	} else {			/* else use fragment */
+		nfo = f->fi[k].fo;
+		f->fi[k].fo += nrays*sizeof(RAYVAL);
+		f->fi[k].nrd -= nrays;
 	}
-	if (nrays) {		/* write the new fragment */
+	return(nfo);
+}
+
+
+int
+hdsyncbeam(hp, i)		/* sync beam in memory with beam on disk */
+register HOLO	*hp;
+register int	i;
+{
+	unsigned int4	nrays;
+	unsigned int	n;
+	long	nfo;
+					/* check file status */
+	if (hdfragl[hp->fd].writerr)
+		return(-1);
+#ifdef DEBUG
+	if (i < 1 | i > nbeams(hp))
+		error(CONSISTENCY, "bad beam index in hdsyncbeam");
+#endif
+					/* is current fragment OK? */
+	if (hp->bl[i] == NULL || (nrays = hp->bl[i]->nrm) == hp->bi[i].nrd)
+		return(0);
+	if (hp->bi[i].nrd)		/* relinquish old fragment */
+		hdfreefrag(hp->fd, &hp->bi[i]);
+	if (nrays) {			/* get and write new fragment */
+		nfo = hdallocfrag(hp->fd, nrays);
 		errno = 0;
 		if (lseek(hp->fd, nfo, 0) < 0)
 			error(SYSTEM, "cannot seek on holodeck file");
 		n = hp->bl[i]->nrm * sizeof(RAYVAL);
 		if (write(hp->fd, (char *)hdbray(hp->bl[i]), n) != n) {
-			hp->dirty = -1;		/* avoid recursive error */
-			error(SYSTEM, "write error in hdsyncbi");
+			hdfragl[hp->fd].writerr++;
+			hdsync(NULL, 0);	/* sync directories */
+			error(SYSTEM, "write error in hdsyncbeam");
 		}
-	}
+		hp->bi[i].fo = nfo;
+	} else
+		hp->bi[i].fo = 0L;
 	biglob(hp)->nrd += nrays - hp->bi[i].nrd;
 	hp->bi[i].nrd = nrays;
-	hp->bi[i].fo = nfo;
-	markdirty(hp);		/* section directory now out of date */
+	markdirty(hp);			/* section directory now out of date */
 	return(1);
 }
 
@@ -451,6 +570,8 @@ register int	i;
 			nchanged += hdfreebeam(hdlist[i], 0);
 		return(nchanged);
 	}
+	if (hdfragl[hp->fd].writerr)	/* check for file error */
+		return(0);
 	if (i == 0) {			/* clear entire holodeck */
 		nchanged = 0;
 		for (i = nbeams(hp); i > 0; i--)
@@ -458,14 +579,16 @@ register int	i;
 				nchanged += hdfreebeam(hp, i);
 		return(nchanged);
 	}
+#ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
 		error(CONSISTENCY, "bad beam index to hdfreebeam");
+#endif
 	if (hp->bl[i] == NULL)
 		return(0);
 					/* check for additions */
 	nchanged = hp->bl[i]->nrm - hp->bi[i].nrd;
 	if (nchanged)
-		hdsyncbi(hp, i);			/* write new fragment */
+		hdsyncbeam(hp, i);		/* write new fragment */
 	blglob(hp)->nrm -= hp->bl[i]->nrm;
 	free((char *)hp->bl[i]);		/* free memory */
 	hp->bl[i] = NULL;
@@ -498,8 +621,10 @@ register int	i;
 #endif
 		return(nchanged);
 	}
+#ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
 		error(CONSISTENCY, "bad beam index to hdkillbeam");
+#endif
 	if (hp->bl[i] != NULL) {	/* free memory */
 		blglob(hp)->nrm -= nchanged = hp->bl[i]->nrm;
 		free((char *)hp->bl[i]);
@@ -507,74 +632,75 @@ register int	i;
 		nchanged = hp->bi[i].nrd;
 	if (hp->bi[i].nrd) {		/* free file fragment */
 		hp->bl[i] = &emptybeam;
-		hdsyncbi(hp, i);
+		hdsyncbeam(hp, i);
 	}
 	hp->bl[i] = NULL;
 	return(nchanged);
 }
 
 
-hdlrulist(ha, ba, n, hp)	/* add beams from holodeck to LRU list */
-register HOLO	*ha[];			/* section list (NULL terminated) */
-register int	ba[];			/* beam index to go with section */
-int	n;				/* length of arrays minus 1 */
+int
+hdlrulist(hb, nents, n, hp)	/* add beams from holodeck to LRU list */
+register HDBEAMI	*hb;		/* beam list */
+int	nents;				/* current list length */
+int	n;				/* maximum list length */
 register HOLO	*hp;			/* section we're adding from */
 {
 	register int	i, j;
-	int	nents;
-					/* find last entry in LRU list */
-	for (j = 0; ha[j] != NULL; j++)
-		;
-	nents = j;
 					/* insert each beam from hp */
-	for (i = nbeams(hp); i > 0; i--) {
+	for (i = 1; i <= nbeams(hp); i++) {
 		if (hp->bl[i] == NULL)		/* check if loaded */
 			continue;
-		if ((j = ++nents) > n)		/* grow list if we can */
+#if 0
+		if (hp->bl[i]->tick == hdclock)	/* preempt swap? */
+			continue;
+#endif
+		if ((j = ++nents) >= n)		/* grow list if we can */
 			nents--;
 		for ( ; ; ) {			/* bubble into place */
 			if (!--j || hp->bl[i]->tick >=
-					ha[j-1]->bl[ba[j-1]]->tick) {
-				ha[j] = hp;
-				ba[j] = i;
+					hb[j-1].h->bl[hb[j-1].b]->tick) {
+				hb[j].h = hp;
+				hb[j].b = i;
 				break;
 			}
-			ha[j] = ha[j-1];
-			ba[j] = ba[j-1];
+			copystruct(hb+j, hb+(j-1));
 		}
 	}
-	ha[nents] = NULL;		/* all done */
-	ba[nents] = 0;
+	return(nents);			/* return new list length */
 }
 
 
+int
 hdfreecache(pct, honly)		/* free up cache space, writing changes */
 int	pct;				/* maximum percentage to free */
 register HOLO	*honly;			/* NULL means check all */
 {
-	HOLO	*hp[FREEBEAMS+1];
-	int	bn[FREEBEAMS+1];
+	HDBEAMI	hb[FREEBEAMS];
 	int	freetarget;
+	int	n;
 	register int	i;
 						/* compute free target */
 	freetarget = (honly != NULL) ? blglob(honly)->nrm :
 			hdmemuse(0)/sizeof(RAYVAL) ;
 	freetarget = freetarget*pct/100;
+	if (freetarget <= 0)
+		return(0);
 						/* find least recently used */
-	hp[0] = NULL;
-	bn[0] = 0;
+	n = 0;
 	if (honly != NULL)
-		hdlrulist(hp, bn, FREEBEAMS, honly);
+		n = hdlrulist(hb, n, FREEBEAMS, honly);
 	else
 		for (i = 0; hdlist[i] != NULL; i++)
-			hdlrulist(hp, bn, FREEBEAMS, hdlist[i]);
+			n = hdlrulist(hb, n, FREEBEAMS, hdlist[i]);
 						/* free LRU beams */
-	for (i = 0; hp[i] != NULL; i++) {
-		hdfreebeam(hp[i], bn[i]);
-		if ((freetarget -= hp[i]->bi[bn[i]].nrd) <= 0)
+	for (i = 0; i < n; i++) {
+		hdfreebeam(hb[i].h, hb[i].b);
+		if ((freetarget -= hb[i].h->bi[hb[i].b].nrd) <= 0)
 			break;
 	}
-	hdsync(honly);		/* synchronize directories as necessary */
+	hdsync(honly, 0);	/* synchronize directories as necessary */
+	return(-freetarget);	/* return how far past goal we went */
 }
 
 
@@ -586,6 +712,8 @@ 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 */