--- ray/src/hd/holofile.c	1997/12/29 15:17:45	3.15
+++ ray/src/hd/holofile.c	1998/01/04 12:32:53	3.19
@@ -22,7 +22,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #define PCTFREE		20	/* 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,42 @@ 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 */
 
 
 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 */
 }
 
 
@@ -75,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;
 	}
 }
 
@@ -213,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);
 }
@@ -231,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);
 }
 
 
@@ -348,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);
 }
 
 
@@ -375,25 +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);
-	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->h, hb->b);
+	}
+	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);
@@ -401,16 +410,115 @@ int	(*bf)();		/* callback function (optional) */
 }
 
 
+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 */
+		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 */
+						/* 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 +527,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);			/* section directory now out of date */
 	return(1);
 }
 
@@ -525,7 +563,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;