--- ray/src/hd/rholo.c	1997/12/08 20:27:34	3.18
+++ ray/src/hd/rholo.c	1997/12/12 18:12:40	3.21
@@ -32,6 +32,8 @@ char	*outdev = NULL;		/* output device name */
 
 int	readinp = 0;		/* read commands from stdin */
 
+int	force = 0;		/* allow overwrite of holodeck */
+
 time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
@@ -59,7 +61,6 @@ char	*argv[];
 {
 	HDGRID	hdg;
 	int	i;
-	int	force = 0;
 						/* mark start time */
 	starttime = time(NULL);
 	initurand(16384);			/* initialize urand */
@@ -224,7 +225,7 @@ initrholo()			/* get our holodeck running */
 	if (ncprocs > 0) {
 		i = start_rtrace();
 		if (i < 1)
-			error(USER, "cannot start rtrace process");
+			error(USER, "cannot start rtrace process(es)");
 		if (vdef(REPORT)) {		/* make first report */
 			printargs(rtargc, rtargv, stderr);
 			report(0);
@@ -279,19 +280,23 @@ rholo()				/* holodeck main loop */
 		if (!disp_check(idle))
 			return(0);
 					/* display only? */
-	if (ncprocs <= 0)
-		return(1);
+	if (nprocs <= 0)
+		return(outdev != NULL);
 					/* check file size */
 	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
 		error(WARNING, "file limit exceeded");
-		return(0);
+		done_rtrace();
+		idle = 1;
+		return(1);	/* comes back */
 	}
 					/* check time */
 	if (endtime > 0 || reporttime > 0)
 		t = time(NULL);
 	if (endtime > 0 && t >= endtime) {
 		error(WARNING, "time limit exceeded");
-		return(0);
+		done_rtrace();
+		idle = 1;
+		return(1);	/* comes back */
 	}
 	if (reporttime > 0 && t >= reporttime)
 		report(t);
@@ -300,17 +305,14 @@ rholo()				/* holodeck main loop */
 		p = freepacks; freepacks = p->next; p->next = NULL;
 		if (!next_packet(p)) {
 			p->next = freepacks; freepacks = p;
+			idle = 1;
 			break;
 		}
 		if (pl == NULL) pl = p;
 		else plend->next = p;
 		plend = p;
 	}
-	idle = pl == NULL && freepacks != NULL;
-					/* are we out of stuff to do? */
-	if (idle && outdev == NULL)
-		return(0);
-					/* else process packets */
+					/* process packets */
 	done_packets(do_packets(pl));
 	return(1);			/* and continue */
 }
@@ -319,13 +321,17 @@ rholo()				/* holodeck main loop */
 report(t)			/* report progress so far */
 time_t	t;
 {
-	if (t == 0)
+	static time_t	seconds2go = 1000000;
+
+	if (t == 0L)
 		t = time(NULL);
-	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);
+	sprintf(errmsg, "%ld packets (%ld rays) done after %.2f hours\n",
+			npacksdone, nraysdone, (t-starttime)/3600.);
+	eputs(errmsg);
+	if (seconds2go == 1000000)
+		seconds2go = vdef(REPORT) ? (long)(vflt(REPORT)*60. + .5) : 0L;
+	if (seconds2go)
+		reporttime = t + seconds2go;
 }
 
 
@@ -500,13 +506,52 @@ PACKET	*pl;
 		p->next = freepacks;
 		freepacks = p;
 	}
-	if (n2flush > 512*RPACKSIZ*ncprocs) {
+	if (n2flush > 512*RPACKSIZ*nprocs) {
 		hdflush(NULL);			/* flush holodeck buffers */
 		n2flush = 0;
 	}
 }
 
 
+int
+done_rtrace()			/* clean up and close rtrace calculation */
+{
+	int	status;
+					/* already closed? */
+	if (!nprocs)
+		return;
+					/* report activity */
+	wputs("closing rtrace process...\n");
+					/* flush beam queue */
+	done_packets(flush_queue());
+					/* close rtrace */
+	if ((status = end_rtrace()))
+		error(WARNING, "bad exit status from rtrace");
+	if (vdef(REPORT))		/* report time */
+		report(0);
+	return(status);			/* return status */
+}
+
+
+new_rtrace()			/* restart rtrace calculation */
+{
+	char	combuf[128];
+
+	if (nprocs > 0)			/* already running? */
+		return;
+	wputs("restarting rtrace process...\n");
+	if (vdef(RIF)) {		/* rerun rad to update octree */
+		sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
+		if (system(combuf))
+			error(WARNING, "error running rad");
+	}
+	if (start_rtrace() < 1)		/* start rtrace */
+		error(WARNING, "cannot restart rtrace");
+	else if (vdef(REPORT))
+		report(0);
+}
+
+
 getradfile(rfargs)		/* run rad and get needed variables */
 char	*rfargs;
 {
@@ -540,10 +585,9 @@ char	*rfargs;
 	else
 		sprintf(cp, ")[ \t]*=' > %s", tf2);
 	if (system(combuf)) {
-		error(SYSTEM, "cannot execute rad command");
 		unlink(tf2);			/* clean up */
 		unlink(tf1);
-		quit(1);
+		error(SYSTEM, "cannot execute rad command");
 	}
 	if (pippt == NULL) {
 		loadvars(tf2);			/* load variables */
@@ -610,22 +654,18 @@ int	ec;
 	int	status = 0;
 
 	if (hdlist[0] != NULL) {	/* flush holodeck */
-		if (ncprocs > 0) {
-			done_packets(flush_queue());
-			status = end_rtrace();	/* close rtrace */
-			hdflush(NULL);
-			if (vdef(REPORT)) {
-				long	fsiz, fuse;
-				report(0);
-				fsiz = hdfilen(hdlist[0]->fd);
-				fuse = hdfiluse(hdlist[0]->fd, 1);
-				fprintf(stderr,
+		if (nprocs > 0)
+			status = done_rtrace();
+		hdflush(NULL);
+		if (ncprocs > 0 && vdef(REPORT)) {
+			long	fsiz, fuse;
+			fsiz = hdfilen(hdlist[0]->fd);
+			fuse = hdfiluse(hdlist[0]->fd, 1);
+			fprintf(stderr,
 			"%s: %.1f Mbyte holodeck file, %.1f%% fragmentation\n",
-						hdkfile, fsiz/(1024.*1024.),
-						100.*(fsiz-fuse)/fsiz);
-			}
-		} else
-			hdflush(NULL);
+					hdkfile, fsiz/(1024.*1024.),
+					100.*(fsiz-fuse)/fsiz);
+		}
 	}
 	if (orig_mode >= 0)		/* reset holodeck access mode */
 		fchmod(hdlist[0]->fd, orig_mode);