--- ray/src/hd/holofile.c	1997/12/29 15:17:45	3.15
+++ ray/src/hd/holofile.c	1998/11/09 17:10:53	3.28
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -16,13 +16,13 @@ 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	1500	/* 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		131000	/* maximum fragments/file to track (0==inf) */
+#define MAXFRAG		32767	/* maximum fragments/file to track (0==inf) */
 #endif
 
 #ifndef BSD
@@ -30,42 +30,60 @@ static char SCCSid[] = "$SunId$ SGI";
 #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 */
 
 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	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 */
 
 
+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 >= nhdfrags) {
-		if (nhdfrags)
-			hdfrag = (struct fragment *)realloc((char *)hdfrag,
-					(fd+1)*sizeof(struct fragment));
-		else
-			hdfrag = (struct fragment *)malloc(
-					(fd+1)*sizeof(struct fragment));
-		if (hdfrag == NULL)
-			error(SYSTEM, "out of memory in hdattach");
-		bzero((char *)(hdfrag+nhdfrags),
-				(fd+1-nhdfrags)*sizeof(struct fragment));
-		nhdfrags = fd+1;
+	if (fd >= nhdfragls) {
+		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;
 	}
-	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 */
 }
 
 
@@ -75,36 +93,22 @@ 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;
 	}
 }
 
 
-markdirty(hp)			/* mark holodeck section directory dirty */
-register HOLO	*hp;
-{
-	static BEAMI	smudge = {0, -1};
-
-	if (hp->dirty)		/* already marked? */
-		return;
-	hp->dirty = 1;
-	if (lseek(hp->fd, biglob(hp)->fo+(nbeams(hp)-1)*sizeof(BEAMI), 0) < 0
-			|| write(hp->fd, (char *)&smudge,
-					sizeof(BEAMI)) != sizeof(BEAMI))
-		error(SYSTEM, "seek/write error in markdirty");
-}
-
-
 HOLO *
 hdinit(fd, hproto)	/* initialize a holodeck section in a file */
 int	fd;			/* corresponding file descriptor */
 HDGRID	*hproto;		/* holodeck section grid */
 {
+	long	rtrunc;
 	long	fpos;
 	register HOLO	*hp;
 	register int	n;
@@ -125,8 +129,12 @@ HDGRID	*hproto;		/* holodeck section grid */
 		if (read(fd, (char *)(hp->bi+1), n) != n)
 			error(SYSTEM, "failure loading holodeck directory");
 						/* check that it's clean */
-		if (hp->bi[nbeams(hp)].fo < 0)
-			error(USER, "dirty holodeck section");
+		for (n = nbeams(hp); n > 0; n--)
+			if (hp->bi[n].fo < 0) {
+				hp->bi[n].fo = 0;
+				error(WARNING, "dirty holodeck section");
+				break;
+			}
 	} else {			/* assume we're creating it */
 		if ((hp = hdalloc(hproto)) == NULL)
 			goto memerr;
@@ -144,13 +152,19 @@ HDGRID	*hproto;		/* holodeck section grid */
 	hdattach(fd);
 					/* check rays on disk */
 	fpos = hdfilen(fd);
-	biglob(hp)->nrd = 0;
+	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)
-				hp->bi[n].nrd = 0;	/* off end */
-			else
+			if (hp->bi[n].fo+hp->bi[n].nrd*sizeof(RAYVAL) > 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) {
@@ -164,6 +178,54 @@ memerr:
 }
 
 
+markdirty(hp, i)		/* mark holodeck directory position dirty */
+register HOLO	*hp;
+int	i;
+{
+	static BEAMI	smudge = {0, -1};
+	int	mindist, minpos;
+	register int	j;
+
+	if (!hp->dirty++) {			/* write smudge first time */
+		if (lseek(hp->fd, biglob(hp)->fo+(i-1)*sizeof(BEAMI), 0) < 0
+				|| write(hp->fd, (char *)&smudge,
+					sizeof(BEAMI)) != sizeof(BEAMI))
+			error(SYSTEM, "seek/write error in markdirty");
+		hp->dirseg[0].s = i;
+		hp->dirseg[0].n = 1;
+		return;
+	}
+						/* insert into segment list */
+	for (j = hp->dirty; j--; ) {
+		if (!j || hp->dirseg[j-1].s < i) {
+			hp->dirseg[j].s = i;
+			hp->dirseg[j].n = 1;
+			break;
+		}
+		copystruct(hp->dirseg+j, hp->dirseg+(j-1));
+	}
+	mindist = nbeams(hp);			/* find closest neighbors */
+	for (j = hp->dirty; --j; )
+		if (hp->dirseg[j].s - (hp->dirseg[j-1].s + hp->dirseg[j-1].n)
+				< mindist) {
+			mindist = hp->dirseg[j].s -
+					(hp->dirseg[j-1].s + hp->dirseg[j-1].n);
+			minpos = j;
+		}
+	if (hp->dirty > MAXDIRSE || mindist <= BUFSIZ/sizeof(BEAMI)) {
+		j = minpos - 1;			/* coalesce neighbors */
+		if (hp->dirseg[j].s + hp->dirseg[j].n <
+				hp->dirseg[minpos].s + hp->dirseg[minpos].n) {
+			hp->dirseg[j].n = hp->dirseg[minpos].s +
+					hp->dirseg[minpos].n - hp->dirseg[j].s;
+		}
+		hp->dirty--;			/* close the gap */
+		for (j = minpos; j < hp->dirty; j++)
+			copystruct(hp->dirseg+j, hp->dirseg+(j+1));
+	}
+}
+
+
 int
 hdsync(hp, all)			/* update beams and directory on disk */
 register HOLO	*hp;
@@ -183,13 +245,16 @@ int	all;
 			hdsyncbeam(hp, j);
 	if (!hp->dirty)			/* directory clean? */
 		return(0);
-	errno = 0;
-	if (lseek(hp->fd, biglob(hp)->fo, 0) < 0)
-		error(SYSTEM, "cannot seek on holodeck file");
-	n = nbeams(hp)*sizeof(BEAMI);
-	if (write(hp->fd, (char *)(hp->bi+1), n) != n)
-		error(SYSTEM, "cannot update holodeck section directory");
-	hp->dirty = 0;
+	errno = 0;			/* write dirty segments */
+	for (j = 0; j < hp->dirty; j++) {
+		if (lseek(hp->fd, biglob(hp)->fo +
+				(hp->dirseg[j].s-1)*sizeof(BEAMI), 0) < 0)
+			error(SYSTEM, "cannot seek on holodeck file");
+		n = hp->dirseg[j].n * sizeof(BEAMI);
+		if (write(hp->fd, (char *)(hp->bi+hp->dirseg[j].s), n) != n)
+			error(SYSTEM, "cannot update section directory");
+	}
+	hp->dirty = 0;			/* all clean */
 	return(1);
 }
 
@@ -213,11 +278,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);
 }
@@ -231,14 +296,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);
 }
 
 
@@ -285,13 +350,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);
@@ -300,20 +364,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");
 }
 
 
@@ -331,32 +390,36 @@ 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]);
 }
 
 
 int
-hdfilord(hb1, hb2)	/* order beams for optimal loading */
+hdfilord(hb1, hb2)	/* order beams for quick loading */
 register HDBEAMI	*hb1, *hb2;
 {
-	register int	c;
-				/* sort by file descriptor first */
+	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 */
-	return(hb1->h->bi[hb1->b].fo - hb2->h->bi[hb2->b].fo);
+	c = hb1->h->bi[hb1->b].fo - hb2->h->bi[hb2->b].fo;
+	return(c > 0 ? 1 : c < 0 ? -1 : 0);
 }
 
 
@@ -366,51 +429,158 @@ int	n;			/* list length */
 int	(*bf)();		/* callback function (optional) */
 {
 	unsigned	origcachesize, memuse;
-	register BEAM	*bp;
 	int	bytesloaded, needbytes, bytes2free;
+	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");
 					/* sort list for optimal access */
 	qsort((char *)hb, n, sizeof(HDBEAMI), hdfilord);
-	bytesloaded = needbytes = 0;	/* figure out memory needs */
+	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--; )
-			if ((bp = hb[i].h->bl[hb[i].b]) != NULL) {
-				bp->tick = hdclock;	/* preempt swap */
-				bytesloaded += bp->nrm;
-			} else				/* prepare to load */
-				needbytes += hb[i].h->bi[hb[i].b].nrd;
-		bytesloaded *= sizeof(RAYVAL);
+			needbytes += hb[i].h->bi[hb[i].b].nrd;
 		needbytes *= sizeof(RAYVAL);
 		do {				/* free enough memory */
 			memuse = hdmemuse(0);
-			bytes2free = needbytes - (signed)(hdcachesize-memuse);
-			if (bytes2free > (signed)(memuse - bytesloaded))
+			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 */
 	}
-	hdcachesize = 0;		/* load the ordered 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].h, hb[i].b);
+			(*bf)(bp, hb+i);
 	hdcachesize = origcachesize;	/* resume dynamic swapping */
 }
 
 
+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
+	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 */
+		register BEAMI	*newp;
+		if (f->fi == NULL)
+			newp = (BEAMI *)malloc((j+FRAGBLK)*sizeof(BEAMI));
+		else
+			newp = (BEAMI *)realloc((char *)f->fi,
+					(j+FRAGBLK)*sizeof(BEAMI));
+		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) {
+			f->fi[j].fo = bi->fo;
+			f->fi[j].nrd = bi->nrd;
+			break;
+		}
+		copystruct(f->fi+j, f->fi+(j-1));
+	}
+					/* coalesce adjacent fragments */
+						/* 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;
+			}
+			break;
+		}
+}
+
+
+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;
+	}
+	return(nfo);
+}
+
+
 int
 hdsyncbeam(hp, i)		/* sync beam in memory with beam on disk */
 register HOLO	*hp;
 register int	i;
 {
-	unsigned int	nrays;
-	long	nfo;
+	unsigned int4	nrays;
 	unsigned int	n;
+	long	nfo;
 					/* check file status */
-	if (hdfrag[hp->fd].writerr)
+	if (hdfragl[hp->fd].writerr)
 		return(-1);
 #ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
@@ -419,95 +589,25 @@ register int	i;
 					/* is current fragment OK? */
 	if (hp->bl[i] == NULL || (nrays = hp->bl[i]->nrm) == hp->bi[i].nrd)
 		return(0);
-					/* locate fragment */
-	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);
-
-	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++;
-#if MAXFRAG
-			if (j >= MAXFRAG-1)
-				f->nfrags--;
-#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 hdsyncbeam");
-			}
-			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));
-			}
-					/* coalesce adjacent fragments */
-			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;
-			}
-			if (j+1 < f->nfrags && f->fi[j].fo == f->fi[j+1].fo +
-					f->fi[j+1].nrd*sizeof(RAYVAL)) {
-				f->fi[j+1].nrd += f->fi[j].nrd;
-				f->fi[j].nrd = 0;
-			}
-		}
-		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;
-			f->fi[k].fo += nrays*sizeof(RAYVAL);
-			f->fi[k].nrd -= nrays;
-		}
-					/* 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;
-	}
-	if (nrays) {		/* write the new fragment */
+	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) {
-			hdfrag[hp->fd].writerr++;
-			hdsync(hp, 0);		/* sync directory */
+			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, i);		/* section directory now out of date */
 	return(1);
 }
 
@@ -525,7 +625,7 @@ register int	i;
 			nchanged += hdfreebeam(hdlist[i], 0);
 		return(nchanged);
 	}
-	if (hdfrag[hp->fd].writerr)	/* check for file error */
+	if (hdfragl[hp->fd].writerr)	/* check for file error */
 		return(0);
 	if (i == 0) {			/* clear entire holodeck */
 		nchanged = 0;
@@ -603,7 +703,7 @@ register HOLO	*hp;			/* section we're adding from */
 {
 	register int	i, 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 0
@@ -635,6 +735,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) ;
@@ -655,6 +760,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 */
 }
 
@@ -667,10 +778,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 */