--- ray/src/hd/holofile.c	1999/01/25 09:58:41	3.35
+++ ray/src/hd/holofile.c	2003/06/30 14:59:11	3.49
@@ -1,22 +1,23 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: holofile.c,v 3.49 2003/06/30 14:59:11 schorsch Exp $";
 #endif
-
 /*
  * Routines for managing holodeck files
  *
  *	9/30/97	GWLarson
  */
 
+#include "copyright.h"
+
+#include <string.h>
+
 #include "holo.h"
 
 #ifndef CACHESIZE
-#ifdef BIGMEM
-#define CACHESIZE	32	/* default cache size (Mbytes, 0==inf) */
+#ifdef SMLMEM
+#define CACHESIZE	5
 #else
-#define CACHESIZE	12
+#define CACHESIZE	17	/* default cache size (Mbytes, 0==inf) */
 #endif
 #endif
 #ifndef FREEBEAMS
@@ -30,7 +31,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #endif
 #ifndef FF_DEFAULT
 				/* when to free a beam fragment */
-#define FF_DEFAULT	(FF_ALLOC|FF_WRITE|FF_KILL)
+#define FF_DEFAULT	(FF_WRITE|FF_KILL)
 #endif
 #ifndef MINDIRSEL
 				/* minimum directory seek length */
@@ -52,15 +53,49 @@ HOLO	*hdlist[HDMAX+1];	/* holodeck pointers (NULL term
 
 static struct fraglist {
 	short	nlinks;		/* number of holodeck sections using us */
-	short	writerr;	/* write error encountered */
+	short	writable;	/* 0 read-only, <0 write error encountered */
 	int	nfrags;		/* number of known fragments */
 	BEAMI	*fi;		/* fragments, descending file position */
-	long	flen;		/* last known file length */
+	off_t	flen;		/* last known file length */
 } *hdfragl;		/* fragment lists, indexed by file descriptor */
 
 static int	nhdfragls;	/* size of hdfragl array */
 
 
+HOLO *
+hdalloc(hproto)		/* allocate and set holodeck section based on grid */
+HDGRID	*hproto;
+{
+	HOLO	hdhead;
+	register HOLO	*hp;
+	int	n;
+				/* copy grid to temporary header */
+	memcpy((void *)&hdhead, (void *)hproto, sizeof(HDGRID));
+				/* compute grid vectors and sizes */
+	hdcompgrid(&hdhead);
+				/* allocate header with directory */
+	n = sizeof(HOLO)+nbeams(&hdhead)*sizeof(BEAMI);
+	if ((hp = (HOLO *)malloc(n)) == NULL)
+		return(NULL);
+				/* copy header information */
+	copystruct(hp, &hdhead);
+				/* allocate and clear beam list */
+	hp->bl = (BEAM **)malloc((nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
+	if (hp->bl == NULL) {
+		free((void *)hp);
+		return(NULL);
+	}
+	memset((void *)hp->bl, '\0', (nbeams(hp)+1)*sizeof(BEAM *)+sizeof(BEAM));
+	hp->bl[0] = (BEAM *)(hp->bl+nbeams(hp)+1);	/* set blglob(hp) */
+	hp->fd = -1;
+	hp->dirty = 0;
+	hp->priv = NULL;
+				/* clear beam directory */
+	memset((void *)hp->bi, '\0', (nbeams(hp)+1)*sizeof(BEAMI));
+	return(hp);		/* all is well */
+}
+
+
 char *
 hdrealloc(ptr, siz, rout)	/* (re)allocate memory, retry then error */
 char	*ptr;
@@ -70,7 +105,7 @@ char	*rout;
 	register char	*newp;
 					/* call malloc/realloc */
 	if (ptr == NULL) newp = (char *)malloc(siz);
-	else newp = (char *)realloc(ptr, siz);
+	else newp = (char *)realloc((void *)ptr, siz);
 					/* check success */
 	if (newp == NULL && rout != NULL) {
 		hdfreecache(25, NULL);	/* free some memory */
@@ -85,18 +120,20 @@ char	*rout;
 }
 
 
-hdattach(fd)		/* start tracking file fragments for some section */
+hdattach(fd, wr)	/* start tracking file fragments for some section */
 register int	fd;
+int	wr;
 {
 	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));
+		memset((void *)(hdfragl+nhdfragls),
+				'\0', (fd+1-nhdfragls)*sizeof(struct fraglist));
 		nhdfragls = fd+1;
 	}
 	hdfragl[fd].nlinks++;
-	hdfragl[fd].flen = lseek(fd, 0L, 2);	/* get file length */
+	hdfragl[fd].writable = wr;		/* set writable flag */
+	hdfragl[fd].flen = lseek(fd, (off_t)0, 2);	/* get file length */
 }
 
 
@@ -109,7 +146,7 @@ register int	fd;
 	if (fd < 0 | fd >= nhdfragls || !hdfragl[fd].nlinks)
 		return;
 	if (!--hdfragl[fd].nlinks && hdfragl[fd].nfrags) {
-		free((char *)hdfragl[fd].fi);
+		free((void *)hdfragl[fd].fi);
 		hdfragl[fd].fi = NULL;
 		hdfragl[fd].nfrags = 0;
 	}
@@ -121,13 +158,14 @@ hdinit(fd, hproto)	/* initialize a holodeck section in
 int	fd;			/* corresponding file descriptor */
 HDGRID	*hproto;		/* holodeck section grid */
 {
-	long	rtrunc;
-	long	fpos;
+	off_t	rtrunc;
+	off_t	fpos;
+	int	writable;
 	register HOLO	*hp;
 	register int	n;
 					/* prepare for system errors */
 	errno = 0;
-	if ((fpos = lseek(fd, 0L, 1)) < 0)
+	if ((fpos = lseek(fd, (off_t)0, 1)) < 0)
 		error(SYSTEM, "cannot determine holodeck file position");
 	if (hproto == NULL) {		/* assume we're loading it */
 		HDGRID	hpr;
@@ -148,7 +186,14 @@ HDGRID	*hproto;		/* holodeck section grid */
 				error(WARNING, "dirty holodeck section");
 				break;
 			}
-	} else {			/* assume we're creating it */
+						/* check writability */
+		if (fd < nhdfragls && hdfragl[fd].nlinks)
+			writable = hdfragl[fd].writable;
+		else
+			writable = lseek(fd, fpos, 0) == fpos &&
+				write(fd, (char *)hp, sizeof(HDGRID)) ==
+							sizeof(HDGRID);
+	} else {			/* else assume we're creating it */
 		if ((hp = hdalloc(hproto)) == NULL)
 			goto memerr;
 						/* write header and skeleton */
@@ -157,12 +202,13 @@ HDGRID	*hproto;		/* holodeck section grid */
 					sizeof(HDGRID) ||
 				write(fd, (char *)(hp->bi+1), n) != n)
 			error(SYSTEM, "cannot write header to holodeck file");
+		writable = 1;
 	}
 	hp->fd = fd;	
 	hp->dirty = 0;
 	biglob(hp)->fo = fpos + sizeof(HDGRID);
 					/* start tracking fragments */
-	hdattach(fd);
+	hdattach(fd, writable);
 					/* check rays on disk */
 	fpos = hdfilen(fd);
 	biglob(hp)->nrd = rtrunc = 0;
@@ -191,7 +237,7 @@ memerr:
 }
 
 
-markdirty(hp, i)		/* mark holodeck directory position dirty */
+hdmarkdirty(hp, i)		/* mark holodeck directory position dirty */
 register HOLO	*hp;
 int	i;
 {
@@ -203,7 +249,7 @@ int	i;
 		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");
+			error(SYSTEM, "seek/write error in hdmarkdirty");
 		hp->dirseg[0].s = i;
 		hp->dirseg[0].n = 1;
 		return;
@@ -304,18 +350,18 @@ int	all;			/* include overhead (painful) */
 }
 
 
-long
+off_t
 hdfilen(fd)		/* return file length for fd */
 int	fd;
 {
-	long	fpos, flen;
+	off_t	fpos, flen;
 
 	if (fd < 0)
 		return(-1);
 	if (fd >= nhdfragls || !hdfragl[fd].nlinks) {
-		if ((fpos = lseek(fd, 0L, 1)) < 0)
+		if ((fpos = lseek(fd, (off_t)0, 1)) < 0)
 			return(-1);
-		flen = lseek(fd, 0L, 2);
+		flen = lseek(fd, (off_t)0, 2);
 		lseek(fd, fpos, 0);
 		return(flen);
 	}
@@ -323,12 +369,12 @@ int	fd;
 }
 
 
-long
+off_t
 hdfiluse(fd, all)	/* compute file usage (in bytes) */
 int	fd;			/* open file descriptor to check */
 int	all;			/* include overhead and unflushed data */
 {
-	long	total = 0;
+	off_t	total = 0;
 	register int	i, j;
 
 	for (j = 0; hdlist[j] != NULL; j++) {
@@ -387,7 +433,7 @@ int	nr;			/* number of new rays desired */
 		hdfreefrag(hp, i);		/* relinquish old fragment */
 	p = hdbray(hp->bl[i]) + hp->bl[i]->nrm;
 	hp->bl[i]->nrm += nr;			/* update in-core structure */
-	bzero((char *)p, nr*sizeof(RAYVAL));
+	memset((void *)p, '\0', nr*sizeof(RAYVAL));
 	blglob(hp)->tick = hp->bl[i]->tick = hdclock++;	/* update LRU clock */
 	return(p);				/* point to new rays */
 }
@@ -427,15 +473,15 @@ int
 hdfilord(hb1, hb2)	/* order beams for quick loading */
 register HDBEAMI	*hb1, *hb2;
 {
-	register long	c;
+	register off_t	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);
+	if (hb1->h->fd != hb2->h->fd)
+		return(hb1->h->fd - hb2->h->fd);
 				/* 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);
@@ -457,7 +503,7 @@ int	(*bf)();		/* callback function (optional) */
 		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);
+	qsort((void *)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 */
@@ -501,6 +547,8 @@ int	i;
 	DCHECK(hp->fd < 0 | hp->fd >= nhdfragls || !hdfragl[hp->fd].nlinks,
 			CONSISTENCY, "bad file descriptor in hdfreefrag");
 	f = &hdfragl[hp->fd];
+	if (!f->writable)
+		return(0);
 	if (f->nfrags % FRAGBLK == 0) {	/* delete empty remnants */
 		for (j = k = 0; k < f->nfrags; j++, k++) {
 			while (f->fi[k].nrd == 0)
@@ -525,7 +573,7 @@ int	i;
 		if (f->fi == NULL)
 			newp = (BEAMI *)malloc((j+FRAGBLK)*sizeof(BEAMI));
 		else
-			newp = (BEAMI *)realloc((char *)f->fi,
+			newp = (BEAMI *)realloc((void *)f->fi,
 					(j+FRAGBLK)*sizeof(BEAMI));
 		if (newp == NULL) {
 			f->nfrags--;	/* graceful failure */
@@ -558,7 +606,8 @@ int	i;
 		}
 	biglob(hp)->nrd -= bi->nrd;		/* tell fragment it's free */
 	bi->nrd = 0;
-	bi->fo = 0L;
+	bi->fo = 0;
+	hdmarkdirty(hp, i);			/* assume we'll reallocate */
 	return(1);
 }
 
@@ -567,7 +616,7 @@ int
 hdfragOK(fd, listlen, listsiz)	/* get fragment list status for file */
 int	fd;
 int	*listlen;
-register int4	*listsiz;
+register int32	*listsiz;
 {
 	register struct fraglist	*f;
 	register int	i;
@@ -587,14 +636,14 @@ register int4	*listsiz;
 }
 
 
-long
+off_t
 hdallocfrag(fd, nrays)		/* allocate a file fragment */
 int	fd;
-unsigned int4	nrays;
+uint32	nrays;
 {
 	register struct fraglist	*f;
 	register int	j;
-	long	nfo;
+	off_t	nfo;
 
 	if (nrays == 0)
 		return(-1L);
@@ -621,19 +670,20 @@ hdsyncbeam(hp, i)		/* sync beam in memory with beam on
 register HOLO	*hp;
 register int	i;
 {
-	unsigned int4	nrays;
+	int	fragfreed;
+	uint32	nrays;
 	unsigned int	n;
-	long	nfo;
+	off_t	nfo;
 					/* check file status */
-	if (hdfragl[hp->fd].writerr)
-		return(-1);
+	if (hdfragl[hp->fd].writable <= 0)
+		return(hdfragl[hp->fd].writable);
 	DCHECK(i < 1 | i > nbeams(hp),
 			CONSISTENCY, "bad beam index in hdsyncbeam");
 					/* is current fragment OK? */
 	if (hp->bl[i] == NULL || (nrays = hp->bl[i]->nrm) == hp->bi[i].nrd)
 		return(0);
-	if (hdfragflags&FF_WRITE && hp->bi[i].nrd)
-		hdfreefrag(hp, i);	/* relinquish old fragment */
+					/* relinquish old fragment? */
+	fragfreed = hdfragflags&FF_WRITE && hp->bi[i].nrd && hdfreefrag(hp,i);
 	if (nrays) {			/* get and write new fragment */
 		nfo = hdallocfrag(hp->fd, nrays);
 		errno = 0;
@@ -641,16 +691,17 @@ 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) {
-			hdfragl[hp->fd].writerr++;
+			hdfragl[hp->fd].writable = -1;
 			hdsync(NULL, 0);	/* sync directories */
 			error(SYSTEM, "write error in hdsyncbeam");
 		}
 		hp->bi[i].fo = nfo;
 	} else
-		hp->bi[i].fo = 0L;
+		hp->bi[i].fo = 0;
 	biglob(hp)->nrd += nrays - hp->bi[i].nrd;
 	hp->bi[i].nrd = nrays;
-	markdirty(hp, i);		/* section directory now out of date */
+	if (!fragfreed)
+		hdmarkdirty(hp, i);		/* need to flag dir. ent. */
 	return(1);
 }
 
@@ -668,13 +719,17 @@ register int	i;
 			nchanged += hdfreebeam(hdlist[i], 0);
 		return(nchanged);
 	}
-	if (hdfragl[hp->fd].writerr)	/* check for file error */
+	if (hdfragl[hp->fd].writable < 0)	/* check for file error */
 		return(0);
 	if (i == 0) {			/* clear entire holodeck */
+		if (blglob(hp)->nrm == 0)
+			return(0);		/* already clear */
 		nchanged = 0;
 		for (i = nbeams(hp); i > 0; i--)
 			if (hp->bl[i] != NULL)
 				nchanged += hdfreebeam(hp, i);
+		DCHECK(blglob(hp)->nrm != 0,
+				CONSISTENCY, "bad beam count in hdfreebeam");
 		return(nchanged);
 	}
 	DCHECK(i < 1 | i > nbeams(hp),
@@ -686,7 +741,7 @@ register int	i;
 	if (nchanged)
 		hdsyncbeam(hp, i);		/* write new fragment */
 	blglob(hp)->nrm -= hp->bl[i]->nrm;
-	free((char *)hp->bl[i]);		/* free memory */
+	free((void *)hp->bl[i]);		/* free memory */
 	hp->bl[i] = NULL;
 	return(nchanged);
 }
@@ -706,7 +761,10 @@ register int	i;
 		return(nchanged);
 	}
 	if (i == 0) {			/* clobber entire holodeck */
+		if (biglob(hp)->nrd == 0 & blglob(hp)->nrm == 0)
+			return(0);		/* already empty */
 		nchanged = 0;
+		nchanged = 0;
 		for (i = nbeams(hp); i > 0; i--)
 			if (hp->bi[i].nrd > 0 || hp->bl[i] != NULL)
 				nchanged += hdkillbeam(hp, i);
@@ -714,21 +772,22 @@ register int	i;
 				CONSISTENCY, "bad beam count in hdkillbeam");
 		return(nchanged);
 	}
-	DCHECK(i < 1 | i > nbeams(hp),
-			CONSISTENCY, "bad beam index to hdkillbeam");
+	DCHECK(i < 1 | i > nbeams(hp), CONSISTENCY,
+			"bad beam index to hdkillbeam");
+	DCHECK(!hdfragl[hp->fd].writable, CONSISTENCY,
+			"hdkillbeam called on read-only holodeck");
 	if (hp->bl[i] != NULL) {	/* free memory */
 		blglob(hp)->nrm -= nchanged = hp->bl[i]->nrm;
-		free((char *)hp->bl[i]);
+		free((void *)hp->bl[i]);
+		hp->bl[i] = NULL;
 	} else
 		nchanged = hp->bi[i].nrd;
-	if (hp->bi[i].nrd) {
-		if (hdfragflags&FF_KILL)
-			hdfreefrag(hp, i);
-		biglob(hp)->nrd -= hp->bi[i].nrd;
-		hp->bi[i].nrd = 0;	/* make sure it's gone */
-		hp->bi[i].fo = 0L;
+	if (hp->bi[i].nrd && !(hdfragflags&FF_KILL && hdfreefrag(hp,i))) {
+		biglob(hp)->nrd -= hp->bi[i].nrd;	/* free failed */
+		hp->bi[i].nrd = 0;
+		hp->bi[i].fo = 0;
+		hdmarkdirty(hp, i);
 	}
-	hp->bl[i] = NULL;
 	return(nchanged);
 }
 
@@ -817,13 +876,12 @@ 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);
+		free((void *)hdfragl);
 		hdfragl = NULL; nhdfragls = 0;
 		return;
 	}
 					/* flush all data and free memory */
-	hdfreebeam(hp, 0);
-	hdsync(hp, 0);
+	hdflush(hp);
 					/* release fragment resources */
 	hdrelease(hp->fd);
 					/* remove hp from active list */
@@ -833,6 +891,6 @@ register HOLO	*hp;		/* NULL means clean up all */
 				i++;
 			break;
 		}
-	free((char *)hp->bl);		/* free beam list */
-	free((char *)hp);		/* free holodeck struct */
+	free((void *)hp->bl);		/* free beam list */
+	free((void *)hp);		/* free holodeck struct */
 }