--- ray/src/rt/rxcmain.cpp 2024/10/29 00:36:54 2.1 +++ ray/src/rt/rxcmain.cpp 2025/04/22 17:12:25 2.17 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rxcmain.cpp,v 2.1 2024/10/29 00:36:54 greg Exp $"; +static const char RCSid[] = "$Id: rxcmain.cpp,v 2.17 2025/04/22 17:12:25 greg Exp $"; #endif /* * rxcmain.c - main for rxcontrib ray contribution tracer @@ -21,14 +21,6 @@ int nproc = 1; /* number of processes requested */ int inpfmt = 'a'; /* input format */ int outfmt = 'f'; /* output format */ -int contrib = 0; /* computing contributions? */ - -int xres = 0; /* horizontal (scan) size */ -int yres = 0; /* vertical resolution */ - -int imm_irrad = 0; /* compute immediate irradiance? */ -int lim_dist = 0; /* limit distance? */ - int report_intvl = 0; /* reporting interval (seconds) */ extern char * progname; // global argv[0] @@ -38,7 +30,7 @@ RcontribSimulManager myRCmanager; // global rcontrib s #define RCONTRIB_FEATURES "Multiprocessing\n" \ "Accumulation\nRecovery\n" \ "ImmediateIrradiance\n" \ - "ProgressReporting?\nDistanceLimiting\n" \ + "ProgressReporting\nDistanceLimiting\n" \ "InputFormats=a,f,d\nOutputFormats=f,d,c\n" \ "Outputs=V,W\n" \ "OutputCS=RGB,spec\n" @@ -49,20 +41,21 @@ static void printdefaults(void) /* print default values to stdout */ { printf("-c %-5d\t\t\t# accumulated rays per record\n", myRCmanager.accum); - printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-', - contrib ? "contributions" : "coefficients"); - if (imm_irrad) + printf(myRCmanager.HasFlag(RCcontrib) ? + "-V+\t\t\t\t# output contributions\n" : + "-V-\t\t\t\t# output coefficients\n"); + if (myRCmanager.HasFlag(RTimmIrrad)) printf("-I+\t\t\t\t# immediate irradiance on\n"); printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); - if (xres > 0) - printf("-x %-9d\t\t\t# x resolution\n", xres); - printf("-y %-9d\t\t\t# y resolution\n", yres); - printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : + printf("-x %-9d\t\t\t# x resolution\n", myRCmanager.xres); + printf("-y %-9d\t\t\t# y resolution\n", myRCmanager.yres); + printf(myRCmanager.HasFlag(RTlimDist) ? + "-ld+\t\t\t\t# limit distance on\n" : "-ld-\t\t\t\t# limit distance off\n"); printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n", inpfmt, outfmt, formstr(inpfmt), formstr(outfmt)); if (report_intvl > 0) - printf("-t %-9d\t\t\t# time between reports\n", report_intvl); + printf("-t %-9d\t\t\t# time between reports\n", report_intvl); printf(erract[WARNING].pf != NULL ? "-w+\t\t\t\t# warning messages on\n" : "-w-\t\t\t\t# warning messages off\n"); @@ -81,7 +74,7 @@ onsig( /* fatal signal */ _exit(signo); #ifdef SIGALRM - alarm(15); /* allow 15 seconds to clean up */ + alarm(600); /* allow 10 minutes to clean up */ signal(SIGALRM, SIG_DFL); /* make certain we do die */ #endif eputs("signal - "); @@ -102,18 +95,6 @@ sigdie( /* set fatal signal */ sigerr[signo] = msg; } -const char * -formstr(int f) // return format identifier -{ - switch (f) { - case 'a': return("ascii"); - case 'f': return("float"); - case 'd': return("double"); - case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT); - } - return("unknown"); -} - /* set input/output format */ static void setformat(const char *fmt) @@ -150,6 +131,23 @@ fmterr: error(USER, errmsg); } +/* Set default options */ +static void +default_options(void) +{ + rand_samp = 1; + dstrsrc = 0.9; + directrelay = 3; + vspretest = 512; + srcsizerat = .2; + specthresh = .02; + specjitter = 1.; + maxdepth = -10; + minweight = 2e-3; + ambres = 256; + ambdiv = 350; + ambounce = 1; +} /* Set overriding options */ static void @@ -160,7 +158,6 @@ override_options(void) ambacc = 0; } - int main(int argc, char *argv[]) { @@ -191,6 +188,8 @@ main(int argc, char *argv[]) /* initialize calcomp routines early */ initfunc(); calcontext(RCCONTEXT); + /* set rcontrib defaults */ + default_options(); /* option city */ for (i = 1; i < argc; i++) { /* expand arguments */ @@ -218,47 +217,44 @@ main(int argc, char *argv[]) continue; } switch (argv[i][1]) { - case 'n': /* number of cores */ + case 'n': /* number of processes */ check(2,"i"); nproc = atoi(argv[++i]); if (nproc < 0 && (nproc += RadSimulManager::GetNCores()) <= 0) nproc = 1; break; - case 'V': /* output contributions */ - check_bool(2,contrib); + case 'V': /* output contributions? */ + rval = myRCmanager.HasFlag(RCcontrib); + check_bool(2,rval); + myRCmanager.SetFlag(RCcontrib, rval); break; case 'x': /* x resolution */ check(2,"i"); - xres = atoi(argv[++i]); + myRCmanager.xres = atoi(argv[++i]); break; case 'y': /* y resolution */ check(2,"i"); - yres = atoi(argv[++i]); + myRCmanager.yres = atoi(argv[++i]); break; - case 'w': /* warnings */ + case 'w': /* warnings on/off */ rval = (erract[WARNING].pf != NULL); check_bool(2,rval); if (rval) erract[WARNING].pf = wputs; else erract[WARNING].pf = NULL; break; - case 'e': /* expression */ - check(2,"s"); - scompile(argv[++i], NULL, 0); - break; case 'l': /* limit distance */ if (argv[i][2] != 'd') goto badopt; - check_bool(3,lim_dist); + rval = myRCmanager.HasFlag(RTlimDist); + check_bool(3,rval); + myRCmanager.SetFlag(RTlimDist, rval); break; case 'I': /* immed. irradiance */ - check_bool(2,imm_irrad); + rval = myRCmanager.HasFlag(RTimmIrrad); + check_bool(2,rval); + myRCmanager.SetFlag(RTimmIrrad, rval); break; - case 'f': /* file or force or format */ - if (!argv[i][2]) { - check(2,"s"); - loadfunc(argv[++i]); - break; - } + case 'f': /* force or format */ if (argv[i][2] == 'o') { check_bool(3,force_open); break; @@ -266,7 +262,7 @@ main(int argc, char *argv[]) setformat(argv[i]+2); myRCmanager.SetDataFormat(outfmt); break; - case 'o': /* output */ + case 'o': /* output file */ check(2,"s"); curout = argv[++i]; break; @@ -294,7 +290,7 @@ main(int argc, char *argv[]) check(2,"s"); myRCmanager.AddModifier(argv[++i], curout, prms, binval, bincnt); break; - case 'M': /* modifier file */ + case 'M': /* file of modifier names */ check(2,"s"); myRCmanager.AddModFile(argv[++i], curout, prms, binval, bincnt); break; @@ -308,14 +304,14 @@ main(int argc, char *argv[]) } if (i != argc-1) error(USER, "expected single octree argument"); + + override_options(); /* override some option settings */ + + if (!myRCmanager.GetOutput()) // check that we have work to do + error(USER, "missing required modifier argument"); // get ready to rock... if (setspectrsamp(CNDX, WLPART) < 0) error(USER, "unsupported spectral sampling"); - - if (!myRCmanager.GetOutputs(NULL)) // check that we're ready - error(USER, "missing required modifier argument"); - /* override some option settings */ - override_options(); /* set up signal handling */ sigdie(SIGINT, "Interrupt"); #ifdef SIGHUP @@ -339,6 +335,11 @@ main(int argc, char *argv[]) myRCmanager.LoadOctree(argv[argc-1]); // add to header myRCmanager.AddHeader(argc-1, argv); + { + char buf[128] = "SOFTWARE= "; + strcpy(buf+10, VersionID); + myRCmanager.AddHeader(buf); + } // prepare output files if (recover) myRCmanager.outOp = RCOrecover; @@ -348,13 +349,11 @@ main(int argc, char *argv[]) myRCmanager.outOp = RCOnew; // rval = # rows recovered rval = myRCmanager.PrepOutput(); - // check if all done - if (recover && rval >= myRCmanager.GetRowMax()) { + // check if recovered everything + if (rval >= myRCmanager.GetRowMax()) { error(WARNING, "nothing left to compute"); quit(0); - } // add processes as requested - myRCmanager.SetThreadCount(nproc); - + } rxcontrib(rval); /* trace ray contributions (loop) */ quit(0); /* exit clean */ @@ -409,7 +408,7 @@ getRayBundle(FVECT *orig_dir = NULL) int n2go = myRCmanager.accum; switch (inpfmt) { - case 'a': // ASCII input + case 'a': // ASCII input if (!orig_dir) return skipWords(6*n2go); while (n2go-- > 0) { @@ -422,12 +421,13 @@ getRayBundle(FVECT *orig_dir = NULL) orig_dir += 2; } break; - case 'f': // float input + case 'f': // float input if (!orig_dir) return skipBytes(6*sizeof(float)*n2go); #ifdef SMLFLT if (getbinary(orig_dir, sizeof(FVECT), 2*n2go, stdin) != 2*n2go) return false; + orig_dir += 2*n2go; #else while (n2go-- > 0) { float fvecs[6]; @@ -439,12 +439,13 @@ getRayBundle(FVECT *orig_dir = NULL) } #endif break; - case 'd': // double input + case 'd': // double input if (!orig_dir) return skipBytes(6*sizeof(double)*n2go); #ifndef SMLFLT if (getbinary(orig_dir, sizeof(FVECT), 2*n2go, stdin) != 2*n2go) return false; + orig_dir += 2*n2go; #else while (n2go-- > 0) { double dvecs[6]; @@ -460,13 +461,10 @@ getRayBundle(FVECT *orig_dir = NULL) error(INTERNAL, "unsupported format in getRayBundle()"); return false; } - int warned = 0; // normalize directions - n2go = myRCmanager.accum; + n2go = myRCmanager.accum; // normalize directions while (n2go-- > 0) { orig_dir -= 2; - if (normalize(orig_dir[1]) == 0) - if (!warned++) - error(WARNING, "zero ray direction on input"); + normalize(orig_dir[1]); } return true; } @@ -494,19 +492,26 @@ rxcontrib(const int rstart) } last_report = tstart = time(0); } - while (r < totRows) { // getting to work... + // start children as requested + myRCmanager.SetThreadCount(nproc); + + while (r < totRows) { // loop until done time_t tnow; if (!getRayBundle(odarr)) goto readerr; - if (myRCmanager.ComputeRecord(odarr) < 0) + if (myRCmanager.ComputeRecord(odarr) <= 0) return; // error reported, hopefully... r++; if (report_intvl <= 0) continue; - if ((r < totRows) & ((tnow = time(0)) < last_report+report_intvl)) + if (r == totRows) // need to finish up? + myRCmanager.SetThreadCount(1); + tnow = time(0); + if ((r < totRows) & (tnow < last_report+report_intvl)) continue; sprintf(errmsg, "%.2f%% done after %.3f hours\n", - 100.*r/totRows, (1./3600.)*(tnow - tstart)); + 100.*myRCmanager.GetRowFinished()/totRows, + (1./3600.)*(tnow - tstart)); eputs(errmsg); last_report = tnow; } @@ -524,6 +529,7 @@ wputs( /* warning output function */ const char *s ) { + if (!erract[WARNING].pf) return; int lasterrno = errno; eputs(s); errno = lasterrno; @@ -551,14 +557,13 @@ eputs( /* put string to stderr */ } -/* Quit program */ +/* Exit program */ void quit( int code ) { - if (!code && myRCmanager.Ready()) // clean up on normal exit - code = myRCmanager.Cleanup(); + myRCmanager.FlushQueue(); // leave nothing in queue exit(code); }