--- ray/src/rt/rtmain.c 2003/02/22 02:07:29 2.1
+++ ray/src/rt/rtmain.c 2005/06/02 04:47:27 2.11
@@ -1,80 +1,24 @@
#ifndef lint
-static const char RCSid[] = "$Id: rtmain.c,v 2.1 2003/02/22 02:07:29 greg Exp $";
+static const char RCSid[] = "$Id: rtmain.c,v 2.11 2005/06/02 04:47:27 greg Exp $";
#endif
/*
* rtmain.c - main for rtrace per-ray calculation program
*/
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include "copyright.h"
-#include "ray.h"
+#include
+#include
+#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"
-#include
-
-#include
/* persistent processes define */
#ifdef F_SETLKW
#define PERSIST 1 /* normal persist */
@@ -83,13 +27,9 @@ static const char RCSid[] = "$Id: rtmain.c,v 2.1 2003/
#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 */
extern char *formstr(); /* string from format */
@@ -106,15 +46,15 @@ extern int lim_dist; /* limit distance? */
extern char *tralist[]; /* list of modifers to trace (or no) */
extern int traincl; /* include == 1, exclude == 0 */
-void onsig();
-void sigdie();
-void printdefaults();
+static int loadflags = ~IO_FILES; /* what to load from octree */
+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)) \
@@ -126,7 +66,6 @@ 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 **tralp;
int duped1;
@@ -231,7 +170,7 @@ char *argv[];
}
if (argv[i][2] == 'I') { /* file */
rval = wordfile(tralp,
- getpath(argv[++i],getlibpath(),R_OK));
+ getpath(argv[++i],getrlibpath(),R_OK));
if (rval < 0) {
sprintf(errmsg,
"cannot open trace include file \"%s\"",
@@ -253,7 +192,7 @@ char *argv[];
}
if (argv[i][2] == 'E') { /* file */
rval = wordfile(tralp,
- getpath(argv[++i],getlibpath(),R_OK));
+ getpath(argv[++i],getrlibpath(),R_OK));
if (rval < 0) {
sprintf(errmsg,
"cannot open trace exclude file \"%s\"",
@@ -292,10 +231,16 @@ char *argv[];
initurand(2048);
/* set up signal handling */
sigdie(SIGINT, "Interrupt");
+#ifdef SIGHUP
sigdie(SIGHUP, "Hangup");
+#endif
sigdie(SIGTERM, "Terminate");
+#ifdef SIGPIPE
sigdie(SIGPIPE, "Broken pipe");
+#endif
+#ifdef SIGALRM
sigdie(SIGALRM, "Alarm clock");
+#endif
#ifdef SIGXCPU
sigdie(SIGXCPU, "CPU limit exceeded");
sigdie(SIGXFSZ, "File size exceeded");
@@ -329,12 +274,8 @@ char *argv[];
openheader();
}
#endif
-#ifdef MSDOS
if (outform != 'a')
- setmode(fileno(stdout), O_BINARY);
- if (octname == NULL)
- setmode(fileno(stdin), O_BINARY);
-#endif
+ SET_FILE_BINARY(stdout);
readoct(octname, loadflags, &thescene, NULL);
nsceneobjs = nobjects;
@@ -400,6 +341,7 @@ runagain:
badopt:
sprintf(errmsg, "command line error at '%s'", argv[i]);
error(USER, errmsg);
+ return 1; /* pro forma return */
#undef check
#undef bool
@@ -407,8 +349,9 @@ badopt:
void
-wputs(s) /* warning output function */
-char *s;
+wputs( /* warning output function */
+ char *s
+)
{
int lasterrno = errno;
eputs(s);
@@ -417,8 +360,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;
@@ -436,17 +380,20 @@ register char *s;
}
-void
-onsig(signo) /* fatal signal */
-int signo;
+static void
+onsig( /* fatal signal */
+ int signo
+)
{
static int gotsig = 0;
if (gotsig++) /* two signals and we're gone! */
_exit(signo);
+#ifdef SIGALRM
alarm(15); /* allow 15 seconds to clean up */
signal(SIGALRM, SIG_DFL); /* make certain we do die */
+#endif
eputs("signal - ");
eputs(sigerr[signo]);
eputs("\n");
@@ -454,10 +401,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);
@@ -465,23 +413,25 @@ char *msg;
}
-void
-printdefaults() /* print default values to stdout */
+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("-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 ? '+' : '-',
+ 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;
@@ -493,6 +443,9 @@ printdefaults() /* print default values to stdout */
case 's': printf(" surface"); break;
case 'w': printf(" weight"); break;
case 'm': printf(" modifier"); break;
+ case 'M': printf(" material"); break;
+ case 'W': printf(" contribution"); break;
+ case '-': printf(" stroke"); break;
}
putchar('\n');
printf(erract[WARNING].pf != NULL ?