--- ray/src/hd/rholo.c 1997/12/02 12:29:17 3.15 +++ ray/src/hd/rholo.c 1997/12/12 18:23:08 3.22 @@ -10,7 +10,6 @@ static char SCCSid[] = "$SunId$ SGI"; #include "rholo.h" #include "random.h" -#include "paths.h" #include #include #include @@ -22,7 +21,7 @@ VARIABLE vv[] = RHVINIT; /* variable-value pairs */ char *progname; /* our program name */ char *hdkfile; /* holodeck file name */ -char froot[MAXPATH]; /* root file name */ +char froot[256]; /* root file name */ int nowarn = 0; /* turn warnings off? */ @@ -30,6 +29,10 @@ int ncprocs = 0; /* desired number of compute process 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 */ @@ -57,10 +60,9 @@ char *argv[]; { HDGRID hdg; int i; - int force = 0; /* mark start time */ starttime = time(NULL); - initurand(10240); /* initialize urand */ + initurand(16384); /* initialize urand */ progname = argv[0]; /* get arguments */ for (i = 1; i < argc && argv[i][0] == '-'; i++) switch (argv[i][1]) { @@ -70,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; @@ -101,8 +106,7 @@ char *argv[]; /* check settings */ checkvalues(); /* load RIF if any */ - if (vdef(RIF)) - getradfile(vval(RIF)); + getradfile(); /* set defaults */ setdefaults(&hdg); /* holodeck exists? */ @@ -116,8 +120,7 @@ char *argv[]; /* check settings */ checkvalues(); /* load RIF if any */ - if (vdef(RIF)) - getradfile(vval(RIF)); + getradfile(); /* set defaults */ setdefaults(NULL); } @@ -187,6 +190,8 @@ initrholo() /* get our holodeck running */ { extern int global_packet(); register int i; + /* close holodeck on exec() */ + fcntl(hdlist[0]->fd, F_SETFD, FD_CLOEXEC); if (outdev != NULL) /* open output device */ disp_open(outdev); @@ -217,7 +222,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); @@ -272,19 +277,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); @@ -293,17 +302,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 */ } @@ -312,13 +318,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; } @@ -363,12 +373,14 @@ register HDGRID *gp; 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", + "%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]) != 12) + &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++) @@ -382,7 +394,8 @@ register HDGRID *gp; if ((d = vflt(GRID)) <= FTINY) badvalue(GRID); for (i = 0; i < 3; i++) - gp->grid[i] = len[i]/d + (1.-FTINY); + if (gp->grid[i] <= 0) + gp->grid[i] = len[i]/d + (1.-FTINY); } @@ -490,67 +503,20 @@ PACKET *pl; p->next = freepacks; freepacks = p; } - if (n2flush > 512*RPACKSIZ*ncprocs) { + if (n2flush > 512*RPACKSIZ*nprocs) { hdflush(NULL); /* flush holodeck buffers */ n2flush = 0; } } -getradfile(rfargs) /* run rad and get needed variables */ -char *rfargs; -{ - 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 */ - mktemp(tf1); - sprintf(tf2, "%s.rif", tf1); - sprintf(combuf, - "rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH", - rfargs, tf1); - cp = combuf; - 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; - } - 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); - } - if (pippt == NULL) { - loadvars(tf2); /* load variables */ - unlink(tf2); - } - rtargc += wordfile(rtargv+rtargc, tf1); /* get rtrace options */ - unlink(tf1); /* clean up */ -} - - rootname(rn, fn) /* remove tail from end of fn */ register char *rn, *fn; { char *tp, *dp; for (tp = NULL, dp = rn; *rn = *fn++; rn++) - if (ISDIRSEP(*rn)) + if (*rn == '/') dp = rn; else if (*rn == '.') tp = rn; @@ -600,22 +566,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);