--- ray/src/rt/rtmain.c 2005/05/25 04:44:26 2.10 +++ ray/src/rt/rtmain.c 2009/12/13 19:39:51 2.20 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtmain.c,v 2.10 2005/05/25 04:44:26 greg Exp $"; +static const char RCSid[] = "$Id: rtmain.c,v 2.20 2009/12/13 19:39:51 greg Exp $"; #endif /* * rtmain.c - main for rtrace per-ray calculation program @@ -7,7 +7,6 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.10 2005 #include "copyright.h" -#include #include #include "platform.h" @@ -19,6 +18,10 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.10 2005 #include "random.h" #include "paths.h" +extern char *progname; /* global argv[0] */ + +extern char *shm_boundary; /* boundary of shared memory */ + /* persistent processes define */ #ifdef F_SETLKW #define PERSIST 1 /* normal persist */ @@ -26,26 +29,32 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.10 2005 #define PCHILD 3 /* child of normal persist */ #endif -char *progname; /* argv[0] */ -char *octname; /* octree name */ char *sigerr[NSIG]; /* signal error messages */ -char *shm_boundary = NULL; /* boundary of shared memory */ char *errfile = NULL; /* error output file */ +int nproc = 1; /* number of processes */ + extern char *formstr(); /* string from format */ -extern int inform; /* input format */ -extern int outform; /* output format */ -extern char *outvals; /* output values */ +int inform = 'a'; /* input format */ +int outform = 'a'; /* output format */ +char *outvals = "v"; /* output specification */ -extern int hresolu; /* horizontal resolution */ -extern int vresolu; /* vertical resolution */ +int hresolu = 0; /* horizontal (scan) size */ +int vresolu = 0; /* vertical resolution */ -extern int imm_irrad; /* compute immediate irradiance? */ -extern int lim_dist; /* limit distance? */ +int imm_irrad = 0; /* compute immediate irradiance? */ +int lim_dist = 0; /* limit distance? */ -extern char *tralist[]; /* list of modifers to trace (or no) */ -extern int traincl; /* include == 1, exclude == 0 */ +#ifndef MAXMODLIST +#define MAXMODLIST 1024 /* maximum modifiers we'll track */ +#endif +extern void (*addobjnotify[])(); /* object notification calls */ +extern void tranotify(OBJECT obj); + +char *tralist[MAXMODLIST]; /* list of modifers to trace (or no) */ +int traincl = -1; /* include == 1, exclude == 0 */ + static int loadflags = ~IO_FILES; /* what to load from octree */ static void onsig(int signo); @@ -67,12 +76,21 @@ main(int argc, char *argv[]) case '-': case '0': var = 0; break; \ default: goto badopt; } int persist = 0; + char *octnm = NULL; char **tralp; int duped1; int rval; int i; /* global program name */ progname = argv[0] = fixargv0(argv[0]); + /* add trace notify function */ + for (i = 0; addobjnotify[i] != NULL; i++) + ; + addobjnotify[i] = tranotify; + /* set our defaults */ + rand_samp = 1; + maxdepth = -10; + minweight = 2e-3; /* option city */ for (i = 1; i < argc; i++) { /* expand arguments */ @@ -99,6 +117,12 @@ main(int argc, char *argv[]) continue; } switch (argv[i][1]) { + case 'n': /* number of cores */ + check(2,"i"); + nproc = atoi(argv[++i]); + if (nproc <= 0) + error(USER, "bad number of processes"); + break; case 'x': /* x resolution */ check(2,"i"); hresolu = atoi(argv[++i]); @@ -225,10 +249,24 @@ main(int argc, char *argv[]) goto badopt; } } + if (nproc > 1) { + if (persist) + error(USER, "multiprocessing incompatible with persist file"); + if (hresolu > 0 && hresolu < nproc) + error(WARNING, "number of cores should not exceed horizontal resolution"); + if (trace != NULL) + error(WARNING, "multiprocessing does not work properly with trace mode"); + } /* initialize object types */ initotypes(); /* initialize urand */ - initurand(2048); + if (rand_samp) { + srandom((long)time(0)); + initurand(0); + } else { + srandom(0L); + initurand(2048); + } /* set up signal handling */ sigdie(SIGINT, "Interrupt"); #ifdef SIGHUP @@ -260,12 +298,12 @@ main(int argc, char *argv[]) #endif /* get octree */ if (i == argc) - octname = NULL; + octnm = NULL; else if (i == argc-1) - octname = argv[i]; + octnm = argv[i]; else goto badopt; - if (octname == NULL) + if (octnm == NULL) error(USER, "missing octree argument"); /* set up output */ #ifdef PERSIST @@ -274,13 +312,9 @@ main(int argc, char *argv[]) openheader(); } #endif -#ifdef _WIN32 if (outform != 'a') SET_FILE_BINARY(stdout); - if (octname == NULL) - SET_FILE_BINARY(stdin); -#endif - readoct(octname, loadflags, &thescene, NULL); + readoct(octnm, loadflags, &thescene, NULL); nsceneobjs = nobjects; if (loadflags & IO_INFO) { /* print header */ @@ -308,10 +342,11 @@ main(int argc, char *argv[]) while ((rval=fork()) == 0) { /* keep on forkin' */ pflock(1); pfhold(); + ambsync(); /* load new values */ } if (rval < 0) error(SYSTEM, "cannot fork child for persist function"); - pfdetach(); /* parent exits */ + pfdetach(); /* parent will run then exit */ } } runagain: @@ -319,7 +354,7 @@ runagain: dupheader(); /* send header to stdout */ #endif /* trace rays */ - rtrace(NULL); + rtrace(NULL, nproc); /* flush ambient file */ ambsync(); #ifdef PERSIST @@ -334,7 +369,6 @@ runagain: } } if (persist == PCHILD) { /* wait for a signal then go again */ - close(duped1); /* release output handle */ pfhold(); raynum = nrays = 0; /* reinitialize */ goto runagain; @@ -424,8 +458,9 @@ printdefaults(void) /* print default values to stdou if (imm_irrad) printf("-I+\t\t\t\t# immediate irradiance on\n"); - printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); - printf("-y %-9d\t\t\t# y resolution\n", vresolu); + printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc); + printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu); + printf("-y %-9d\t\t\t# y resolution\n", vresolu); printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" : "-ld-\t\t\t\t# limit distance off\n"); printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-', @@ -439,6 +474,7 @@ printdefaults(void) /* print default values to stdou case 'o': printf(" origin"); break; case 'd': printf(" direction"); break; case 'v': printf(" value"); break; + case 'V': printf(" contribution"); break; case 'l': printf(" length"); break; case 'L': printf(" first_length"); break; case 'p': printf(" point"); break; @@ -446,9 +482,9 @@ printdefaults(void) /* print default values to stdou case 'N': printf(" unperturbed_normal"); break; case 's': printf(" surface"); break; case 'w': printf(" weight"); break; + case 'W': printf(" coefficient"); break; case 'm': printf(" modifier"); break; case 'M': printf(" material"); break; - case 'W': printf(" contribution"); break; case '-': printf(" stroke"); break; } putchar('\n');