--- ray/src/hd/rholo.c	1998/12/10 10:47:29	3.43
+++ ray/src/hd/rholo.c	1999/02/10 16:24:07	3.49
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
+/* Copyright (c) 1999 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -14,9 +14,20 @@ static char SCCSid[] = "$SunId$ SGI";
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifndef FRAGWARN
+#define FRAGWARN	20		/* fragmentation for warning (%) */
+#endif
 #ifndef MAXQTIME
 #define MAXQTIME	5		/* target maximum seconds in queue */
 #endif
+					/* manual cache flushing frequency */
+#ifndef RTFLUSH
+#if MAXQTIME
+#define RTFLUSH		(300/MAXQTIME*totqlen)	/* <= 5 minutes */
+#else
+#define RTFLUSH		(50*totqlen)		/* just guess */
+#endif
+#endif
 			/* the following must be consistent with rholo.h */
 int	NVARS = NRHVARS;		/* total number of variables */
 
@@ -49,7 +60,7 @@ long	nraysdone = 0L;		/* number of rays done */
 long	npacksdone = 0L;	/* number of packets done */
 
 PACKET	*freepacks;		/* available packets */
-int	totqlen;		/* maximum queue length when full */
+int	totqlen;		/* maximum queue length (number of packets) */
 
 char  *sigerr[NSIG];		/* signal error messages */
 
@@ -144,11 +155,13 @@ int  signo;
 {
 	static int  gotsig = 0;
 
-	if (gotsig++)			/* two signals and we're gone! */
+	if (gotsig > 1)			/* we're going as fast as we can! */
+		return;
+	if (gotsig++) {			/* two signals and we split */
+		hdsync(NULL, 0);	/* don't leave w/o saying goodbye */
 		_exit(signo);
-
-	alarm(60);			/* allow 60 seconds to clean up */
-	signal(SIGALRM, SIG_DFL);	/* make certain we do die */
+	}
+	alarm(300);			/* allow 5 minutes to clean up */
 	eputs("signal - ");
 	eputs(sigerr[signo]);
 	eputs("\n");
@@ -269,8 +282,10 @@ memerr:
 
 rholo()				/* holodeck main loop */
 {
+	static long	nextfragwarn = 100*(1L<<20);
 	static int	idle = 0;
 	PACKET	*pl = NULL, *plend;
+	long	fsiz;
 	int	pksiz;
 	register PACKET	*p;
 	time_t	t;
@@ -284,12 +299,21 @@ rholo()				/* holodeck main loop */
 			return(1);
 	} else if (idle)
 		return(0);		/* all done */
-					/* check file size */
-	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
+	fsiz = hdfilen(hdlist[0]->fd);	/* check file size */
+	if (maxdisk > 0 && fsiz >= maxdisk) {
 		error(WARNING, "file limit exceeded");
 		done_rtrace();
 		return(1);	/* comes back */
 	}
+#if FRAGWARN
+	if (fsiz >= nextfragwarn &&
+		(fsiz-hdfiluse(hdlist[0]->fd,0))/(fsiz/100) > FRAGWARN) {
+		sprintf(errmsg, "holodeck file fragmentation is %.0f%%",
+				100.*(fsiz-hdfiluse(hdlist[0]->fd,1))/fsiz);
+		error(WARNING, errmsg);
+		nextfragwarn = fsiz + (fsiz>>2);	/* decent interval */
+	}
+#endif
 	t = time(NULL);			/* check time */
 	if (endtime > 0 && t >= endtime) {
 		error(WARNING, "time limit exceeded");
@@ -299,13 +323,14 @@ rholo()				/* holodeck main loop */
 	if (reporttime > 0 && t >= reporttime)
 		report(t);
 					/* figure out good packet size */
+	pksiz = RPACKSIZ;
 #if MAXQTIME
-	pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
-	if (pksiz < 1)
-		pksiz = 1;
-	else if (pksiz > RPACKSIZ)
+	if (!chunkycmp) {
+		pksiz = nraysdone*MAXQTIME/(totqlen*(t - starttime + 1L));
+		if (pksiz < 1) pksiz = 1;
+		else if (pksiz > RPACKSIZ) pksiz = RPACKSIZ;
+	}
 #endif
-		pksiz = RPACKSIZ;
 	idle = 0;			/* get packets to process */
 	while (freepacks != NULL) {
 		p = freepacks; freepacks = p->next; p->next = NULL;
@@ -497,7 +522,7 @@ PACKET	*pl;
 				p->nr*sizeof(RAYVAL));
 			if (outdev != NULL)	/* display it */
 				disp_packet((PACKHEAD *)p);
-			if (hdcachesize <= 0)	/* manual flushing */
+			if (hdcachesize <= 0)
 				n2flush++;
 			nraysdone += p->nr;
 			npacksdone++;
@@ -506,15 +531,11 @@ PACKET	*pl;
 		p->next = freepacks;		/* push onto free list */
 		freepacks = p;
 	}
-#if MAXQTIME
-	if (n2flush > 300/MAXQTIME*totqlen) {
-#else
-	if (n2flush > 50*totqlen) {
-#endif
-		if (outdev == NULL)
-			hdflush(NULL);		/* flush holodeck buffers */
+	if (n2flush > RTFLUSH) {
+		if (outdev != NULL)
+			hdsync(NULL, 1);
 		else
-			hdsync(NULL, 1);	/* sync holodeck file */
+			hdflush(NULL);
 		n2flush = 0;
 	}
 }