--- ray/src/hd/rholo.c 1997/12/12 18:12:40 3.21 +++ ray/src/hd/rholo.c 1997/12/14 09:46:52 3.27 @@ -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? */ @@ -89,26 +88,27 @@ char *argv[]; default: goto userr; } - /* do we have a job? */ - if (outdev == NULL && ncprocs <= 0) - goto userr; /* get root file name */ rootname(froot, hdkfile=argv[i++]); - /* load... */ - if (i < argc) { /* variables */ - loadvars(argv[i++]); - /* cmdline settings */ - for ( ; i < argc; i++) - if (setvariable(argv[i], matchvar) < 0) { - sprintf(errmsg, "unknown variable: %s", - argv[i]); - error(USER, errmsg); - } - /* check settings */ - checkvalues(); - /* load RIF if any */ - if (vdef(RIF)) - getradfile(vval(RIF)); + /* load variables? */ + if (i < argc) + if (argv[i][0] != '-' && argv[i][0] != '+') + loadvars(argv[i]); /* load variables from file */ + + if (i >= argc || argv[i][0] == '+') + loadholo(); /* load existing holodeck */ + + while (++i < argc) /* get command line settings */ + if (setvariable(argv[i], matchvar) < 0) { + sprintf(errmsg, "unknown variable: %s", argv[i]); + error(USER, errmsg); + } + /* check settings */ + checkvalues(); + /* load RIF if any */ + getradfile(); + + if (hdlist[i] == NULL) { /* create new holodeck */ /* set defaults */ setdefaults(&hdg); /* holodeck exists? */ @@ -117,16 +117,8 @@ char *argv[]; "holodeck file exists -- use -f to overwrite"); /* create holodeck */ creatholo(&hdg); - } else { /* else load holodeck */ - loadholo(); - /* check settings */ - checkvalues(); - /* load RIF if any */ - if (vdef(RIF)) - getradfile(vval(RIF)); - /* set defaults */ + } else /* else just set defaults */ setdefaults(NULL); - } /* initialize */ initrholo(); /* main loop */ @@ -136,7 +128,7 @@ char *argv[]; quit(0); userr: fprintf(stderr, -"Usage: %s {-n nprocs|-o disp} [-w][-f] output.hdk [control.hif [VAR=val ..]]\n", +"Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif|+|- [VAR=val ..]]\n", progname); quit(1); } @@ -209,7 +201,7 @@ initrholo() /* get our holodeck running */ if (!vdef(TIME) || vflt(TIME) <= FTINY) endtime = 0; else - endtime = starttime + vflt(TIME)*3600.; + endtime = starttime + vflt(TIME)*3600. + .5; /* set up memory cache */ if (outdev == NULL) hdcachesize = 0; /* manual flushing */ @@ -236,7 +228,7 @@ initrholo() /* get our holodeck running */ goto memerr; freepacks[--i].nr = 0; freepacks[i].next = NULL; - if (!vbool(OBSTRUCTIONS)) { + if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) { freepacks[i].offset = (float *)bmalloc( RPACKSIZ*sizeof(float)*(i+1) ); if (freepacks[i].offset == NULL) @@ -318,23 +310,6 @@ rholo() /* holodeck main loop */ } -report(t) /* report progress so far */ -time_t t; -{ - static time_t seconds2go = 1000000; - - if (t == 0L) - t = time(NULL); - 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; -} - - setdefaults(gp) /* set default values */ register HDGRID *gp; { @@ -357,10 +332,6 @@ register HDGRID *gp; sprintf(vval(OCTREE), "%s.oct", froot); vdef(OCTREE)++; } - if (!vdef(OBSTRUCTIONS)) { - vval(OBSTRUCTIONS) = "T"; - vdef(OBSTRUCTIONS)++; - } if (!vdef(VDIST)) { vval(VDIST) = "F"; vdef(VDIST)++; @@ -513,98 +484,13 @@ PACKET *pl; } -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; -{ - 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)) { - unlink(tf2); /* clean up */ - unlink(tf1); - error(SYSTEM, "cannot execute rad command"); - } - 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; @@ -653,10 +539,9 @@ int ec; { int status = 0; - if (hdlist[0] != NULL) { /* flush holodeck */ + if (hdlist[0] != NULL) { /* close holodeck */ if (nprocs > 0) - status = done_rtrace(); - hdflush(NULL); + status = done_rtrace(); /* calls hdsync() */ if (ncprocs > 0 && vdef(REPORT)) { long fsiz, fuse; fsiz = hdfilen(hdlist[0]->fd);