--- ray/src/hd/holofile.c	1997/11/04 10:42:03	3.4
+++ ray/src/hd/holofile.c	1997/12/11 19:57:58	3.11
@@ -16,14 +16,19 @@ 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	512	/* maximum beams to free at a time */
 #endif
 #ifndef PCTFREE
-#define PCTFREE		12	/* maximum fraction to free (%) */
+#define PCTFREE		20	/* maximum fraction to free (%) */
 #endif
 
-#define MAXFRAG		8192	/* maximum fragments tracked per open file */
+/* 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 */
 
 int	hdcachesize = CACHESIZE*1024*1024;	/* target cache size (bytes) */
@@ -68,7 +73,7 @@ register int	fd;
 hdrelease(fd)		/* stop tracking file fragments for some section */
 register int	fd;
 {
-	if (fd >= nhdfrags || !hdfrag[fd].nlinks)
+	if (fd < 0 | fd >= nhdfrags || !hdfrag[fd].nlinks)
 		return;
 	if (!--hdfrag[fd].nlinks && hdfrag[fd].nfrags) {
 		free((char *)hdfrag[fd].fi);
@@ -78,6 +83,21 @@ register int	fd;
 }
 
 
+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 */
@@ -102,6 +122,9 @@ HDGRID	*hproto;		/* holodeck section grid */
 		n = nbeams(hp)*sizeof(BEAMI);
 		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");
 	} else {			/* assume we're creating it */
 		if ((hp = hdalloc(hproto)) == NULL)
 			goto memerr;
@@ -188,6 +211,25 @@ int	all;			/* include overhead (painful) */
 
 
 long
+hdfilen(fd)		/* return file length for fd */
+int	fd;
+{
+	long	fpos, flen;
+
+	if (fd < 0)
+		return(-1);
+	if (fd >= nhdfrags || !hdfrag[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);
+}
+
+
+long
 hdfiluse(fd, all)	/* compute file usage (in bytes) */
 int	fd;			/* open file descriptor to check */
 int	all;			/* include overhead and unflushed data */
@@ -293,46 +335,50 @@ register int	i;
 
 
 int
-hdgetbi(hp, i)			/* allocate a file fragment */
+hdsyncbi(hp, i)			/* sync beam in memory with beam on disk */
 register HOLO	*hp;
 register int	i;
 {
-	int	nrays = hp->bl[i]->nrm;
-
-	if (hp->bi[i].nrd == nrays)	/* current one will do? */
+	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)
+		return(-1);
 
 	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 = hp->bi[i].fo + nrays*sizeof(RAYVAL);
+		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;
+			j = f->nfrags++;
 #ifdef MAXFRAG
-			if (j >= MAXFRAG)
+			if (j >= MAXFRAG-1)
 				f->nfrags--;
-			else
 #endif
-			if (j % FRAGBLK == 1) {		/* more frag. space */
+			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,
-						(FRAGBLK-1+j)*sizeof(BEAMI));
+						(j+FRAGBLK)*sizeof(BEAMI));
 				if (f->fi == NULL)
 					error(SYSTEM,
-						"out of memory in hdgetbi");
+						"out of memory in hdsyncbi");
 			}
-			for ( ; ; ) {	/* stick it in our descending list */
-				if (!--j || hp->bi[i].fo < f->fi[j-1].fo) {
+			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;
@@ -354,16 +400,16 @@ register int	i;
 			f->nfrags = j;
 		}
 		k = -1;			/* find closest-sized fragment */
-		for (j = f->nfrags; 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)
 					break;
 		if (k < 0) {		/* no fragment -- extend file */
-			hp->bi[i].fo = f->flen;
+			nfo = f->flen;
 			f->flen += nrays*sizeof(RAYVAL);
 		} else {		/* else use fragment */
-			hp->bi[i].fo = f->fi[k].fo;
+			nfo = f->fi[k].fo;
 			if (f->fi[k].nrd == nrays) {	/* delete fragment */
 				f->nfrags--;
 				for (j = k; j < f->nfrags; j++)
@@ -374,9 +420,20 @@ register int	i;
 			}
 		}
 	}
+	if (nrays) {		/* write the new fragment */
+		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");
+		}
+	}
 	biglob(hp)->nrd += nrays - hp->bi[i].nrd;
 	hp->bi[i].nrd = nrays;
-	hp->dirty++;		/* section directory now out of date */
+	hp->bi[i].fo = nfo;
+	markdirty(hp);		/* section directory now out of date */
 	return(1);
 }
 
@@ -386,7 +443,7 @@ hdfreebeam(hp, i)		/* free beam, writing if dirty */
 register HOLO	*hp;
 register int	i;
 {
-	int	nchanged, n;
+	int	nchanged;
 
 	if (hp == NULL) {		/* clear all holodecks */
 		nchanged = 0;
@@ -396,8 +453,9 @@ register int	i;
 	}
 	if (i == 0) {			/* clear entire holodeck */
 		nchanged = 0;
-		for (i = 1; i <= nbeams(hp); i++)
-			nchanged += hdfreebeam(hp, i);
+		for (i = nbeams(hp); i > 0; i--)
+			if (hp->bl[i] != NULL)
+				nchanged += hdfreebeam(hp, i);
 		return(nchanged);
 	}
 	if (i < 1 | i > nbeams(hp))
@@ -406,15 +464,8 @@ register int	i;
 		return(0);
 					/* check for additions */
 	nchanged = hp->bl[i]->nrm - hp->bi[i].nrd;
-	if (nchanged) {
-		hdgetbi(hp, i);			/* allocate a file position */
-		errno = 0;
-		if (lseek(hp->fd, hp->bi[i].fo, 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)
-			error(SYSTEM, "write error in hdfreebeam");
-	}
+	if (nchanged)
+		hdsyncbi(hp, i);			/* write new fragment */
 	blglob(hp)->nrm -= hp->bl[i]->nrm;
 	free((char *)hp->bl[i]);		/* free memory */
 	hp->bl[i] = NULL;
@@ -422,6 +473,47 @@ register int	i;
 }
 
 
+int
+hdkillbeam(hp, i)		/* delete beam from holodeck */
+register HOLO	*hp;
+register int	i;
+{
+	static BEAM	emptybeam;
+	int	nchanged;
+
+	if (hp == NULL) {		/* clobber all holodecks */
+		nchanged = 0;
+		for (i = 0; hdlist[i] != NULL; i++)
+			nchanged += hdkillbeam(hdlist[i], 0);
+		return(nchanged);
+	}
+	if (i == 0) {			/* clobber entire holodeck */
+		nchanged = 0;
+		for (i = nbeams(hp); i > 0; i--)
+			if (hp->bi[i].nrd > 0 || hp->bl[i] != NULL)
+				nchanged += hdkillbeam(hp, i);
+#ifdef DEBUG
+		if (biglob(hp)->nrd != 0 | blglob(hp)->nrm != 0)
+			error(CONSISTENCY, "bad beam count in hdkillbeam");
+#endif
+		return(nchanged);
+	}
+	if (i < 1 | i > nbeams(hp))
+		error(CONSISTENCY, "bad beam index to hdkillbeam");
+	if (hp->bl[i] != NULL) {	/* free memory */
+		blglob(hp)->nrm -= nchanged = hp->bl[i]->nrm;
+		free((char *)hp->bl[i]);
+	} else
+		nchanged = hp->bi[i].nrd;
+	if (hp->bi[i].nrd) {		/* free file fragment */
+		hp->bl[i] = &emptybeam;
+		hdsyncbi(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 */
@@ -435,7 +527,7 @@ register HOLO	*hp;			/* section we're adding from */
 		;
 	nents = j;
 					/* insert each beam from hp */
-	for (i = nbeams(hp); i > 0; i-- ) {
+	for (i = nbeams(hp); i > 0; i--) {
 		if (hp->bl[i] == NULL)		/* check if loaded */
 			continue;
 		if ((j = ++nents) > n)		/* grow list if we can */