--- ray/src/rt/rtmain.c	2003/10/21 19:19:28	2.8
+++ ray/src/rt/rtmain.c	2010/09/26 15:51:15	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.8 2003/10/21 19:19:28 schorsch Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.21 2010/09/26 15:51:15 greg Exp $";
 #endif
 /*
  *  rtmain.c - main for rtrace per-ray calculation program
@@ -7,17 +7,21 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.8 2003/
 
 #include "copyright.h"
 
-#include  <sys/types.h>
 #include  <signal.h>
 
 #include  "platform.h"
 #include  "rtprocess.h" /* getpid() */
+#include  "resolu.h"
 #include  "ray.h"
 #include  "source.h"
 #include  "ambient.h"
 #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 */
@@ -25,39 +29,41 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.8 2003/
 #define  PCHILD		3		/* child of normal persist */
 #endif
 
-char  *progname;			/* argv[0] */
+char  *sigerr[NSIG];			/* signal error messages */
+char  *errfile = NULL;			/* error output file */
 
-char  *octname;				/* octree name */
+int  nproc = 1;				/* number of processes */
 
-char  *sigerr[NSIG];			/* signal error messages */
+extern char  *formstr();		/* string from format */
+int  inform = 'a';			/* input format */
+int  outform = 'a';			/* output format */
+char  *outvals = "v";			/* output specification */
 
-char  *shm_boundary = NULL;		/* boundary of shared memory */
+int  hresolu = 0;			/* horizontal (scan) size */
+int  vresolu = 0;			/* vertical resolution */
 
-char  *errfile = NULL;			/* error output file */
+int  imm_irrad = 0;			/* compute immediate irradiance? */
+int  lim_dist = 0;			/* limit distance? */
 
-extern char  *formstr();		/* string from format */
-extern int  inform;			/* input format */
-extern int  outform;			/* output format */
-extern char  *outvals;			/* output values */
+#ifndef	MAXMODLIST
+#define	MAXMODLIST	1024		/* maximum modifiers we'll track */
+#endif
 
-extern int  hresolu;			/* horizontal resolution */
-extern int  vresolu;			/* vertical resolution */
+extern void  (*addobjnotify[])();	/* object notification calls */
+extern void  tranotify(OBJECT obj);
 
-extern int  imm_irrad;			/* compute immediate irradiance? */
-extern int  lim_dist;			/* limit distance? */
+char  *tralist[MAXMODLIST];		/* list of modifers to trace (or no) */
+int  traincl = -1;			/* include == 1, exclude == 0 */
 
-extern char  *tralist[];		/* list of modifers to trace (or no) */
-extern int  traincl;			/* include == 1, exclude == 0 */
+static int  loadflags = ~IO_FILES;	/* what to load from octree */
 
-void	onsig(int);
-void	sigdie(int, char*);
-void	printdefaults(void);
+static void onsig(int  signo);
+static void sigdie(int  signo, char  *msg);
+static void printdefaults(void);
 
 
 int
-main(argc, argv)
-int  argc;
-char  *argv[];
+main(int  argc, char  *argv[])
 {
 #define	 check(ol,al)		if (argv[i][ol] || \
 				badarg(argc-i-1,argv+i+1,al)) \
@@ -69,14 +75,22 @@ char  *argv[];
 				case 'n': case 'N': case 'f': case 'F': \
 				case '-': case '0': var = 0; break; \
 				default: goto badopt; }
-	int  loadflags = ~IO_FILES;
 	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 */
@@ -103,6 +117,12 @@ 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]);
@@ -229,10 +249,24 @@ char  *argv[];
 			goto badopt;
 		}
 	}
+	if (nproc > 1) {
+		if (persist)
+			error(USER, "multiprocessing incompatible with persist file");
+		if (!vresolu && 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
@@ -264,12 +298,12 @@ 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
@@ -278,13 +312,9 @@ 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 */
@@ -312,10 +342,11 @@ 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:
@@ -323,7 +354,7 @@ runagain:
 		dupheader();			/* send header to stdout */
 #endif
 					/* trace rays */
-	rtrace(NULL);
+	rtrace(NULL, nproc);
 					/* flush ambient file */
 	ambsync();
 #ifdef  PERSIST
@@ -338,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;
@@ -349,6 +379,7 @@ runagain:
 badopt:
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
+	return 1; /* pro forma return */
 
 #undef	check
 #undef	bool
@@ -356,8 +387,9 @@ badopt:
 
 
 void
-wputs(s)				/* warning output function */
-char	*s;
+wputs(				/* warning output function */
+	char	*s
+)
 {
 	int  lasterrno = errno;
 	eputs(s);
@@ -366,8 +398,9 @@ char	*s;
 
 
 void
-eputs(s)				/* put string to stderr */
-register char  *s;
+eputs(				/* put string to stderr */
+	register char  *s
+)
 {
 	static int  midline = 0;
 
@@ -385,9 +418,10 @@ register char  *s;
 }
 
 
-void
-onsig(signo)				/* fatal signal */
-int  signo;
+static void
+onsig(				/* fatal signal */
+	int  signo
+)
 {
 	static int  gotsig = 0;
 
@@ -405,10 +439,11 @@ int  signo;
 }
 
 
-void
-sigdie(signo, msg)			/* set fatal signal */
-int  signo;
-char  *msg;
+static void
+sigdie(			/* set fatal signal */
+	int  signo,
+	char  *msg
+)
 {
 	if (signal(signo, onsig) == SIG_IGN)
 		signal(signo, SIG_IGN);
@@ -416,26 +451,31 @@ char  *msg;
 }
 
 
-void
+static void
 printdefaults(void)			/* print default values to stdout */
 {
 	register char  *cp;
 
 	if (imm_irrad)
 		printf("-I+\t\t\t\t# immediate irradiance on\n");
-	printf("-x  %-9d\t\t\t# x resolution\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# %s\n", hresolu,
+			vresolu && hresolu ? "x resolution" : "flush interval");
+	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 ? '+' : '-',
+			loadflags & IO_INFO ? "output" : "no");
 	printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
 			inform, outform, formstr(inform), formstr(outform));
-	printf("-o%s\t\t\t\t# output", outvals);
+	printf("-o%-9s\t\t\t# output", outvals);
 	for (cp = outvals; *cp; cp++)
 		switch (*cp) {
-		case 't': printf(" trace"); break;
+		case 't': case 'T': printf(" trace"); break;
 		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;
@@ -443,7 +483,10 @@ 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 '-': printf(" stroke"); break;
 		}
 	putchar('\n');
 	printf(erract[WARNING].pf != NULL ?