--- ray/src/hd/rholo.c 1998/10/08 14:52:26 3.41 +++ ray/src/hd/rholo.c 1999/01/05 11:34:52 3.45 @@ -14,6 +14,9 @@ static char SCCSid[] = "$SunId$ SGI"; #include #include +#ifndef FRAGWARN +#define FRAGWARN 20 /* fragmentation for warning (%) */ +#endif #ifndef MAXQTIME #define MAXQTIME 5 /* target maximum seconds in queue */ #endif @@ -147,7 +150,7 @@ int signo; if (gotsig++) /* two signals and we're gone! */ _exit(signo); - alarm(60); /* allow 60 seconds to clean up */ + alarm(120); /* allow 2 minutes to clean up */ signal(SIGALRM, SIG_DFL); /* make certain we do die */ eputs("signal - "); eputs(sigerr[signo]); @@ -269,8 +272,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 +289,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"); @@ -367,7 +381,7 @@ register HDGRID *gp; for (i = 0; i < 3; i++) len[i] = VLEN(gp->xv[i]); if (!vdef(GRID)) { - d = 2/5e5*( len[0]*len[0]*(len[1]*len[1] + + d = 2/2e5*( len[0]*len[0]*(len[1]*len[1] + len[2]*len[2] + 4*len[1]*len[2]) + len[1]*len[1]*len[2]*(len[2] + 4*len[0]) + 4*len[0]*len[1]*len[2]*len[2] ); @@ -420,6 +434,7 @@ HDGRID *gp; } +int headline(s) /* process information header line */ char *s; { @@ -433,7 +448,7 @@ char *s; HOLOFMT, hdkfile, FMTSTR, fmt); error(USER, errmsg); } - return; + return(0); } for (cp = s; *cp; cp++) /* take off any comments */ if (*cp == '#') { @@ -441,6 +456,7 @@ char *s; break; } setvariable(s, matchvar); /* don't flag errors */ + return(0); }