--- ray/src/hd/rholo.c	1998/01/16 11:45:43	3.37
+++ ray/src/hd/rholo.c	1998/10/27 08:49:50	3.42
@@ -26,8 +26,6 @@ char	*progname;		/* our program name */
 char	*hdkfile;		/* holodeck file name */
 char	froot[256];		/* root file name */
 
-int	nowarn = 0;		/* turn warnings off? */
-
 int	ncprocs = 0;		/* desired number of compute processes */
 
 char	*outdev = NULL;		/* output device name */
@@ -51,10 +49,12 @@ long	nraysdone = 0L;		/* number of rays done */
 long	npacksdone = 0L;	/* number of packets done */
 
 PACKET	*freepacks;		/* available packets */
-int	avgqlen;		/* average queue length when full */
+int	totqlen;		/* maximum queue length when full */
 
 char  *sigerr[NSIG];		/* signal error messages */
 
+extern int	nowarn;		/* turn warnings off? */
+
 extern time_t	time();
 
 
@@ -222,7 +222,7 @@ initrholo()			/* get our holodeck running */
 		endtime = starttime + vflt(TIME)*3600. + .5;
 						/* start rtrace */
 	if (ncprocs > 0) {
-		i = start_rtrace();
+		totqlen = i = start_rtrace();
 		if (i < 1)
 			error(USER, "cannot start rtrace process(es)");
 		if (vdef(REPORT)) {		/* make first report */
@@ -233,8 +233,6 @@ initrholo()			/* get our holodeck running */
 		freepacks = (PACKET *)bmalloc(i*sizeof(PACKET));
 		if (freepacks == NULL)
 			goto memerr;
-		if (!(avgqlen = i/nprocs))	/* record mean queue length */
-			avgqlen = 1;
 		freepacks[--i].nr = 0;
 		freepacks[i].next = NULL;
 		if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) {
@@ -302,7 +300,7 @@ rholo()				/* holodeck main loop */
 		report(t);
 					/* figure out good packet size */
 #if MAXQTIME
-	pksiz = nraysdone*MAXQTIME/(avgqlen*(t - starttime + 1L));
+	pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
 	if (pksiz < 1)
 		pksiz = 1;
 	else if (pksiz > RPACKSIZ)
@@ -422,6 +420,7 @@ HDGRID	*gp;
 }
 
 
+int
 headline(s)			/* process information header line */
 char	*s;
 {
@@ -435,7 +434,7 @@ char	*s;
 					HOLOFMT, hdkfile, FMTSTR, fmt);
 			error(USER, errmsg);
 		}
-		return;
+		return(0);
 	}
 	for (cp = s; *cp; cp++)		/* take off any comments */
 		if (*cp == '#') {
@@ -443,6 +442,7 @@ char	*s;
 			break;
 		}
 	setvariable(s, matchvar);	/* don't flag errors */
+	return(0);
 }
 
 
@@ -455,8 +455,8 @@ loadholo()			/* start loading a holodeck from fname */
 	int4	nextloc;
 					/* open holodeck file */
 	if ((fp = fopen(hdkfile, ncprocs>0 ? "r+" : "r")) == NULL) {
-		sprintf(errmsg, "cannot open \"%s\" for %s", hdkfile,
-				ncprocs>0 ? "appending" : "reading");
+		sprintf(errmsg, "cannot %s \"%s\"",
+				ncprocs>0 ? "append" : "read", hdkfile);
 		error(SYSTEM, errmsg);
 	}
 					/* load variables from header */
@@ -506,8 +506,15 @@ PACKET	*pl;
 		p->next = freepacks;		/* push onto free list */
 		freepacks = p;
 	}
-	if (n2flush > 300/MAXQTIME*avgqlen*nprocs) {
-		hdflush(NULL);			/* flush holodeck buffers */
+#if MAXQTIME
+	if (n2flush > 300/MAXQTIME*totqlen) {
+#else
+	if (n2flush > 50*totqlen) {
+#endif
+		if (outdev == NULL)
+			hdflush(NULL);		/* flush holodeck buffers */
+		else
+			hdsync(NULL, 1);	/* sync holodeck file */
 		n2flush = 0;
 	}
 }
@@ -552,14 +559,6 @@ register char  *s;
 		fflush(stderr);
 		midline = 0;
 	}
-}
-
-
-wputs(s)			/* put warning string to stderr */
-char	*s;
-{
-	if (!nowarn)
-		eputs(s);
 }