--- ray/src/hd/holofile.c	1997/12/18 15:12:23	3.14
+++ ray/src/hd/holofile.c	1998/01/01 13:00:14	3.17
@@ -21,50 +21,51 @@ static char SCCSid[] = "$SunId$ SGI";
 #ifndef PCTFREE
 #define PCTFREE		20	/* 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 */
 
 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 */
 
 
 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 */
 }
 
 
@@ -74,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;
 	}
 }
 
@@ -177,7 +178,7 @@ int	all;
 		return(n);
 	}
 					/* sync the beams */
-	for (j = all ? nbeams(hp) : 0; j > 0; j--)
+	for (j = (all ? nbeams(hp) : 0); j > 0; j--)
 		if (hp->bl[j] != NULL)
 			hdsyncbeam(hp, j);
 	if (!hp->dirty)			/* directory clean? */
@@ -212,11 +213,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);
 }
@@ -230,14 +231,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);
 }
 
 
@@ -347,15 +348,21 @@ register int	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);
 }
 
 
@@ -374,26 +381,28 @@ int	(*bf)();		/* callback function (optional) */
 			error(CONSISTENCY, "bad beam in hdloadbeams");
 					/* sort list for optimal access */
 	qsort((char *)hb, n, sizeof(HDBEAMI), hdfilord);
-	if ((origcachesize = hdcachesize) == 0)
-		goto loadbeams;
-	bytesloaded = needbytes = 0;	/* figure out memory needs */
-	for (i = 0; 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 = 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->h, hb->b);
+	}
 	bytesloaded *= sizeof(RAYVAL);
-	needbytes *= sizeof(RAYVAL);
-	do {				/* free enough memory */
-		memuse = hdmemuse(0);
-		bytes2free = needbytes - (signed)(hdcachesize-memuse);
-		if (bytes2free > (signed)(memuse - bytesloaded))
-			bytes2free = memuse - bytesloaded;
-	} while (bytes2free > 0 &&
-			hdfreecache(100*bytes2free/memuse, NULL) < 0);
-loadbeams:
-	hdcachesize = 0;		/* load the ordered beams w/o swap */
+	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].h, hb[i].b);
@@ -410,7 +419,7 @@ register int	i;
 	long	nfo;
 	unsigned int	n;
 					/* check file status */
-	if (hdfrag[hp->fd].writerr)
+	if (hdfragl[hp->fd].writerr)
 		return(-1);
 #ifdef DEBUG
 	if (i < 1 | i > nbeams(hp))
@@ -420,20 +429,20 @@ register int	i;
 	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 */
+	if (hp->fd >= nhdfragls || !hdfragl[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);
+			hdfragl[hp->fd].flen)		/* EOF special case */
+		hdfragl[hp->fd].flen = (nfo=hp->bi[i].fo) + nrays*sizeof(RAYVAL);
 
 	else {						/* general case */
-		register struct fragment	*f = &hdfrag[hp->fd];
+		register struct fraglist	*f = &hdfragl[hp->fd];
 		register int	j, k;
-					/* relinquish old fragment */
+		n = f->nfrags;		/* relinquish old fragment */
 		if (hp->bi[i].nrd) {
 			j = f->nfrags++;
-#ifdef MAXFRAG
+#if MAXFRAG
 			if (j >= MAXFRAG-1)
 				f->nfrags--;
 #endif
@@ -457,21 +466,21 @@ register int	i;
 				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;
-				}
+			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;
+				n = j-1;
 			}
-			f->nfrags = j;
+			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;
+				if (j < n) n = j;
+			}
 		}
 		k = -1;			/* find closest-sized fragment */
-		for (j = nrays ? f->nfrags : 0; j-- > 0; )
+		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)
@@ -481,15 +490,20 @@ register int	i;
 			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;
-			}
+			f->fi[k].fo += nrays*sizeof(RAYVAL);
+			if (!(f->fi[k].nrd -= nrays) && k < n)
+				n = k;
 		}
+					/* delete empty remnants */
+		for (j = k = n; 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 */
 		errno = 0;
@@ -497,7 +511,7 @@ register int	i;
 			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++;
+			hdfragl[hp->fd].writerr++;
 			hdsync(hp, 0);		/* sync directory */
 			error(SYSTEM, "write error in hdsyncbeam");
 		}
@@ -523,7 +537,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;