--- ray/src/hd/rholo.c	1997/10/31 10:23:29	3.1
+++ ray/src/hd/rholo.c	1997/12/08 18:51:15	3.17
@@ -9,8 +9,11 @@ static char SCCSid[] = "$SunId$ SGI";
  */
 
 #include "rholo.h"
+#include "random.h"
 #include "paths.h"
+#include <signal.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 
 			/* the following must be consistent with rholo.h */
 int	NVARS = NRHVARS;		/* total number of variables */
@@ -23,24 +26,30 @@ char	froot[MAXPATH];		/* root file name */
 
 int	nowarn = 0;		/* turn warnings off? */
 
-double	expval = 1.;		/* global exposure value */
-
 int	ncprocs = 0;		/* desired number of compute processes */
 
 char	*outdev = NULL;		/* output device name */
 
+int	readinp = 0;		/* read commands from stdin */
+
 time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
 
+long	maxdisk;		/* maximum file space (bytes) */
+
 int	rtargc = 1;		/* rtrace command */
 char	*rtargv[128] = {"rtrace", NULL};
 
+int	orig_mode = -1;		/* original file mode (-1 if unchanged) */
+
 long	nraysdone = 0L;		/* number of rays done */
 long	npacksdone = 0L;	/* number of packets done */
 
 PACKET	*freepacks;		/* available packets */
 
+char  *sigerr[NSIG];		/* signal error messages */
+
 extern time_t	time();
 
 
@@ -51,7 +60,9 @@ char	*argv[];
 	HDGRID	hdg;
 	int	i;
 	int	force = 0;
-
+						/* mark start time */
+	starttime = time(NULL);
+	initurand(10240);			/* initialize urand */
 	progname = argv[0];			/* get arguments */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++)
 		switch (argv[i][1]) {
@@ -61,6 +72,9 @@ char	*argv[];
 		case 'f':			/* force overwrite */
 			force++;
 			break;
+		case 'i':			/* read input from stdin */
+			readinp++;
+			break;
 		case 'n':			/* compute processes */
 			if (i >= argc-2)
 				goto userr;
@@ -102,11 +116,19 @@ char	*argv[];
 				"holodeck file exists -- use -f to overwrite");
 							/* create holodeck */
 		creatholo(&hdg);
-	} else					/* else load holodeck */
+	} else {				/* else load holodeck */
 		loadholo();
+							/* check settings */
+		checkvalues();
+							/* load RIF if any */
+		if (vdef(RIF))
+			getradfile(vval(RIF));
+							/* set defaults */
+		setdefaults(NULL);
+	}
 						/* initialize */
 	initrholo();
-						/* run */
+						/* main loop */
 	while (rholo())
 		;
 						/* done */
@@ -119,23 +141,79 @@ userr:
 }
 
 
+onsig(signo)				/* fatal signal */
+int  signo;
+{
+	static int  gotsig = 0;
+
+	if (gotsig++)			/* two signals and we're gone! */
+		_exit(signo);
+
+	alarm(30);			/* allow 30 seconds to clean up */
+	signal(SIGALRM, SIG_DFL);	/* make certain we do die */
+	eputs("signal - ");
+	eputs(sigerr[signo]);
+	eputs("\n");
+	quit(3);
+}
+
+
+sigdie(signo, msg)			/* set fatal signal */
+int  signo;
+char  *msg;
+{
+	if (signal(signo, onsig) == SIG_IGN)
+		signal(signo, SIG_IGN);
+	sigerr[signo] = msg;
+}
+
+
+int
+resfmode(fd, mod)		/* restrict open file access mode */
+int	fd, mod;
+{
+	struct stat	stbuf;
+					/* get original mode */
+	if (fstat(fd, &stbuf) < 0)
+		error(SYSTEM, "cannot stat open holodeck file");
+	mod &= stbuf.st_mode;		/* always more restrictive */
+	if (mod == stbuf.st_mode)
+		return(-1);		/* already set */
+					/* else change it */
+	if (fchmod(fd, mod) < 0) {
+		error(WARNING, "cannot change holodeck file access mode");
+		return(-1);
+	}
+	return(stbuf.st_mode);		/* return original mode */
+}
+
+
 initrholo()			/* get our holodeck running */
 {
 	extern int	global_packet();
 	register int	i;
-						/* check output device */
-	if (outdev != NULL)
-		open_display(outdev);
+						/* close holodeck on exec() */
+	fcntl(hdlist[0]->fd, F_SETFD, FD_CLOEXEC);
+
+	if (outdev != NULL)			/* open output device */
+		disp_open(outdev);
 	else if (ncprocs > 0)			/* else use global ray feed */
 		init_global();
-						/* record the time */
-	starttime = time(NULL);
+						/* record disk space limit */
+	if (!vdef(DISKSPACE))
+		maxdisk = 0;
+	else
+		maxdisk = 1024.*1024.*vflt(DISKSPACE);
+						/* record end time */
 	if (!vdef(TIME) || vflt(TIME) <= FTINY)
 		endtime = 0;
 	else
 		endtime = starttime + vflt(TIME)*3600.;
 						/* set up memory cache */
-	hdcachesize = 1024.*1024.*vflt(CACHE);
+	if (outdev == NULL)
+		hdcachesize = 0;	/* manual flushing */
+	else if (vdef(CACHE))
+		hdcachesize = 1024.*1024.*vflt(CACHE);
 						/* open report file */
 	if (vdef(REPORT)) {
 		register char	*s = sskip2(vval(REPORT), 1);
@@ -171,6 +249,18 @@ initrholo()			/* get our holodeck running */
 			freepacks[i].next = &freepacks[i+1];
 		}
 	}
+					/* set up signal handling */
+	sigdie(SIGINT, "Interrupt");
+	sigdie(SIGHUP, "Hangup");
+	sigdie(SIGTERM, "Terminate");
+	sigdie(SIGPIPE, "Broken pipe");
+	sigdie(SIGALRM, "Alarm clock");
+#ifdef	SIGXCPU
+	sigdie(SIGXCPU, "CPU limit exceeded");
+	sigdie(SIGXFSZ, "File size exceeded");
+#endif
+						/* protect holodeck file */
+	orig_mode = resfmode(hdlist[0]->fd, ncprocs>0 ? 0 : 0444);
 	return;
 memerr:
 	error(SYSTEM, "out of memory in initrholo");
@@ -184,22 +274,26 @@ rholo()				/* holodeck main loop */
 	register PACKET	*p;
 	time_t	t;
 	long	l;
-					/* check display */
-	if (outdev != NULL && !disp_check(idle))
-		return(0);
+
+	if (outdev != NULL)		/* check display */
+		if (!disp_check(idle))
+			return(0);
 					/* display only? */
 	if (ncprocs <= 0)
 		return(1);
 					/* check file size */
-	if (l = 1024.*1024.*vflt(DISKSPACE) > 0 &&
-			hdfiluse(hdlist[0]->fd, 0) + hdmemuse(0) >= l)
+	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
+		error(WARNING, "file limit exceeded");
 		return(0);
+	}
 					/* check time */
-	if (endtime > 0 || vdef(REPORT))
+	if (endtime > 0 || reporttime > 0)
 		t = time(NULL);
-	if (endtime > 0 && t >= endtime)
+	if (endtime > 0 && t >= endtime) {
+		error(WARNING, "time limit exceeded");
 		return(0);
-	if (vdef(REPORT) && t >= reporttime)
+	}
+	if (reporttime > 0 && t >= reporttime)
 		report(t);
 					/* get packets to process */
 	while (freepacks != NULL) {
@@ -227,8 +321,11 @@ time_t	t;
 {
 	if (t == 0)
 		t = time(NULL);
-	fprintf(stderr, "%s: %ld packets done (%ld rays) after %.2f hours\n",
+	fprintf(stderr, "%s: %ld packets (%ld rays) done after %.2f hours\n",
 			progname, npacksdone, nraysdone, (t-starttime)/3600.);
+	fflush(stderr);
+	if (vdef(REPORT))
+		reporttime = t + (time_t)(vflt(REPORT)*60.+.5);
 }
 
 
@@ -248,58 +345,20 @@ register HDGRID	*gp;
 		sprintf(errmsg, "ignoring all but first %s", vnam(SECTION));
 		error(WARNING, errmsg);
 	}
-	if (sscanf(vval(SECTION),
-			"%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
-			&gp->orig[0], &gp->orig[1], &gp->orig[2],
-			&gp->xv[0][0], &gp->xv[0][1], &gp->xv[0][2],
-			&gp->xv[1][0], &gp->xv[1][1], &gp->xv[1][2],
-			&gp->xv[2][0], &gp->xv[2][1], &gp->xv[2][2]) != 12)
-		badvalue(SECTION);
-	maxlen = 0.;
-	for (i = 0; i < 3; i++)
-		if ((len[i] = VLEN(gp->xv[i])) > maxlen)
-			maxlen = len[i];
-	if (!vdef(GRID)) {
-		sprintf(buf, "%.4f", maxlen/16.);
-		vval(GRID) = savqstr(buf);
-		vdef(GRID)++;
-	}
-	if ((d = vflt(GRID)) <= FTINY)
-		badvalue(GRID);
-	for (i = 0; i < 3; i++)
-		gp->grid[i] = len[i]/d + (1.-FTINY);
-	if (!vdef(EXPOSURE)) {
-		sprintf(errmsg, "%s must be defined", vnam(EXPOSURE));
-		error(USER, errmsg);
-	}
-	expval = vval(EXPOSURE)[0] == '-' || vval(EXPOSURE)[0] == '+' ?
-			pow(2., vflt(EXPOSURE)) : vflt(EXPOSURE);
 	if (!vdef(OCTREE)) {
 		if ((vval(OCTREE) = bmalloc(strlen(froot)+5)) == NULL)
 			error(SYSTEM, "out of memory");
 		sprintf(vval(OCTREE), "%s.oct", froot);
 		vdef(OCTREE)++;
 	}
-	if (!vdef(DISKSPACE)) {
-		sprintf(errmsg,
-			"no %s setting, assuming 100 Mbytes available",
-				vnam(DISKSPACE));
-		error(WARNING, errmsg);
-		vval(DISKSPACE) = "100";
-		vdef(DISKSPACE)++;
-	}
-	if (!vdef(CACHE)) {
-		sprintf(errmsg,
-			"no %s setting, assuming 10 Mbytes available",
-				vnam(CACHE));
-		error(WARNING, errmsg);
-		vval(CACHE) = "10";
-		vdef(CACHE)++;
-	}
 	if (!vdef(OBSTRUCTIONS)) {
 		vval(OBSTRUCTIONS) = "T";
 		vdef(OBSTRUCTIONS)++;
 	}
+	if (!vdef(VDIST)) {
+		vval(VDIST) = "F";
+		vdef(VDIST)++;
+	}
 	if (!vdef(OCCUPANCY)) {
 		vval(OCCUPANCY) = "U";
 		vdef(OCCUPANCY)++;
@@ -307,13 +366,42 @@ register HDGRID	*gp;
 				/* append rendering options */
 	if (vdef(RENDER))
 		rtargc += wordstring(rtargv+rtargc, vval(RENDER));
+	
+	if (gp == NULL)		/* already initialized? */
+		return;
+				/* set grid parameters */
+	gp->grid[0] = gp->grid[1] = gp->grid[2] = 0;
+	if (sscanf(vval(SECTION),
+		"%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %hd %hd %hd",
+			&gp->orig[0], &gp->orig[1], &gp->orig[2],
+			&gp->xv[0][0], &gp->xv[0][1], &gp->xv[0][2],
+			&gp->xv[1][0], &gp->xv[1][1], &gp->xv[1][2],
+			&gp->xv[2][0], &gp->xv[2][1], &gp->xv[2][2],
+			&gp->grid[0], &gp->grid[1], &gp->grid[2]) < 12)
+		badvalue(SECTION);
+	maxlen = 0.;
+	for (i = 0; i < 3; i++)
+		if ((len[i] = VLEN(gp->xv[i])) > maxlen)
+			maxlen = len[i];
+	if (!vdef(GRID)) {
+		sprintf(buf, "%.4f", maxlen/8.);
+		vval(GRID) = savqstr(buf);
+		vdef(GRID)++;
+	}
+	if ((d = vflt(GRID)) <= FTINY)
+		badvalue(GRID);
+	for (i = 0; i < 3; i++)
+		if (gp->grid[i] <= 0)
+			gp->grid[i] = len[i]/d + (1.-FTINY);
 }
 
 
 creatholo(gp)			/* create a holodeck output file */
 HDGRID	*gp;
 {
+	extern char	VersionID[];
 	long	endloc = 0;
+	int	fd;
 	FILE	*fp;
 					/* open & truncate file */
 	if ((fp = fopen(hdkfile, "w+")) == NULL) {
@@ -322,14 +410,15 @@ HDGRID	*gp;
 	}
 					/* write information header */
 	newheader("RADIANCE", fp);
+	fprintf(fp, "SOFTWARE= %s\n", VersionID);
 	printvars(fp);
 	fputformat(HOLOFMT, fp);
 	fputc('\n', fp);
 	putw(HOLOMAGIC, fp);		/* put magic number & terminus */
 	fwrite(&endloc, sizeof(long), 1, fp);
-	fflush(fp);			/* flush buffer */
-	initholo(fileno(fp), gp);	/* allocate and initialize index */
-			/* we're dropping fp here.... */
+	fd = dup(fileno(fp));
+	fclose(fp);			/* flush and close stdio stream */
+	hdinit(fd, gp);			/* allocate and initialize index */
 }
 
 
@@ -340,7 +429,7 @@ char	*s;
 	register char	*cp;
 	char	fmt[32];
 
-	if (headidval(fmt, s)) {
+	if (formatval(fmt, s)) {
 		if (strcmp(fmt, HOLOFMT)) {
 			sprintf(errmsg, "%s file \"%s\" has %s%s",
 					HOLOFMT, hdkfile, FMTSTR, fmt);
@@ -359,11 +448,14 @@ char	*s;
 
 loadholo()			/* start loading a holodeck from fname */
 {
+	extern long	ftell();
 	FILE	*fp;
-	long	endloc;
-					/* open input file */
-	if ((fp = fopen(hdkfile, "r+")) == NULL) {
-		sprintf(errmsg, "cannot open \"%s\" for appending", hdkfile);
+	int	fd;
+	long	fpos;
+					/* open holodeck file */
+	if ((fp = fopen(hdkfile, ncprocs>0 ? "r+" : "r")) == NULL) {
+		sprintf(errmsg, "cannot open \"%s\" for %s", hdkfile,
+				ncprocs>0 ? "appending" : "reading");
 		error(SYSTEM, errmsg);
 	}
 					/* load variables from header */
@@ -374,18 +466,21 @@ loadholo()			/* start loading a holodeck from fname */
 				hdkfile);
 		error(USER, errmsg);
 	}
-	fread(&endloc, sizeof(long), 1, fp);
-	if (endloc != 0)
+	fread(&fpos, sizeof(long), 1, fp);
+	if (fpos != 0)
 		error(WARNING, "ignoring multiple sections in holodeck file");
-	fseek(fp, 0L, 1);			/* align system file pointer */
-	initholo(fileno(fp), NULL);		/* allocate and load index */
-			/* we're dropping fp here.... */
+	fpos = ftell(fp);			/* get stdio position */
+	fd = dup(fileno(fp));
+	fclose(fp);				/* done with stdio */
+	lseek(fd, fpos, 0);			/* align system file pointer */
+	hdinit(fd, NULL);			/* allocate and load index */
 }
 
 
 done_packets(pl)		/* handle finished packets */
 PACKET	*pl;
 {
+	static int	n2flush = 0;
 	register PACKET	*p;
 
 	while (pl != NULL) {
@@ -395,24 +490,31 @@ PACKET	*pl;
 				(char *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
 				p->nr*sizeof(RAYVAL));
 			if (outdev != NULL)	/* display it */
-				disp_packet(p);
+				disp_packet((PACKHEAD *)p);
+			if (hdcachesize <= 0)	/* manual flushing */
+				n2flush += p->nr;
+			nraysdone += p->nr;
+			npacksdone++;
 		}
-		nraysdone += p->nr;
-		npacksdone++;
 		p->nr = 0;			/* push onto free list */
 		p->next = freepacks;
 		freepacks = p;
 	}
+	if (n2flush > 512*RPACKSIZ*ncprocs) {
+		hdflush(NULL);			/* flush holodeck buffers */
+		n2flush = 0;
+	}
 }
 
 
 getradfile(rfargs)		/* run rad and get needed variables */
 char	*rfargs;
 {
-	static short	mvar[] = {VIEW,OCTREE,EXPOSURE,REPORT,-1};
+	static short	mvar[] = {OCTREE,-1};
 	static char	tf1[] = TEMPLATE;
 	char	tf2[64];
 	char	combuf[256];
+	char	*pippt;
 	register int	i;
 	register char	*cp;
 					/* create rad command */
@@ -422,24 +524,33 @@ char	*rfargs;
 		"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH",
 			rfargs, tf1);
 	cp = combuf;
-	while (*cp) cp++;		/* match unset variables */
+	while (*cp){
+		if (*cp == '|') pippt = cp;
+		cp++;
+	}				/* match unset variables */
 	for (i = 0; mvar[i] >= 0; i++)
 		if (!vdef(mvar[i])) {
 			*cp++ = '|';
 			strcpy(cp, vnam(mvar[i]));
 			while (*cp) cp++;
+			pippt = NULL;
 		}
-	sprintf(cp, ")[ \t]*=' > %s", tf2);
+	if (pippt != NULL)
+		strcpy(pippt, "> /dev/null");	/* nothing to match */
+	else
+		sprintf(cp, ")[ \t]*=' > %s", tf2);
 	if (system(combuf)) {
 		error(SYSTEM, "cannot execute rad command");
 		unlink(tf2);			/* clean up */
 		unlink(tf1);
 		quit(1);
 	}
-	loadvars(tf2);			/* load variables */
+	if (pippt == NULL) {
+		loadvars(tf2);			/* load variables */
+		unlink(tf2);
+	}
 	rtargc += wordfile(rtargv+rtargc, tf1);	/* get rtrace options */
-	unlink(tf2);			/* clean up */
-	unlink(tf1);
+	unlink(tf1);			/* clean up */
 }
 
 
@@ -506,15 +617,19 @@ int	ec;
 			if (vdef(REPORT)) {
 				long	fsiz, fuse;
 				report(0);
-				fsiz = lseek(hdlist[0]->fd, 0L, 2);
+				fsiz = hdfilen(hdlist[0]->fd);
 				fuse = hdfiluse(hdlist[0]->fd, 1);
 				fprintf(stderr,
-			"%s: %.1f Mbyte holodeck file, %.2f%% fragmentation\n",
+			"%s: %.1f Mbyte holodeck file, %.1f%% fragmentation\n",
 						hdkfile, fsiz/(1024.*1024.),
 						100.*(fsiz-fuse)/fsiz);
 			}
 		} else
 			hdflush(NULL);
 	}
+	if (orig_mode >= 0)		/* reset holodeck access mode */
+		fchmod(hdlist[0]->fd, orig_mode);
+	if (outdev != NULL)		/* close display */
+		disp_close();
 	exit(ec ? ec : status);		/* exit */
 }