ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rtmain.c
(Generate patch)

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.15 by greg, Thu Sep 13 20:02:11 2007 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rtmain.c - main for rtrace per-ray calculation program
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 < #include  "ray.h"
10 > #include  <signal.h>
11  
12 + #include  "platform.h"
13 + #include  "rtprocess.h" /* getpid() */
14 + #include  "resolu.h"
15 + #include  "ray.h"
16   #include  "source.h"
68
17   #include  "ambient.h"
70
18   #include  "random.h"
72
19   #include  "paths.h"
20  
75 #include  <sys/types.h>
76
77 #include  <signal.h>
21                                          /* persistent processes define */
22   #ifdef  F_SETLKW
23   #define  PERSIST        1               /* normal persist */
# Line 83 | Line 26 | static const char      RCSid[] = "$Id$";
26   #endif
27  
28   char  *progname;                        /* argv[0] */
86
29   char  *octname;                         /* octree name */
88
30   char  *sigerr[NSIG];                    /* signal error messages */
90
31   char  *shm_boundary = NULL;             /* boundary of shared memory */
92
32   char  *errfile = NULL;                  /* error output file */
33  
34   extern char  *formstr();                /* string from format */
# Line 106 | Line 45 | extern int  lim_dist;                  /* limit distance? */
45   extern char  *tralist[];                /* list of modifers to trace (or no) */
46   extern int  traincl;                    /* include == 1, exclude == 0 */
47  
48 < void    onsig();
110 < void    sigdie();
111 < void    printdefaults();
48 > static int  loadflags = ~IO_FILES;      /* what to load from octree */
49  
50 + static void onsig(int  signo);
51 + static void sigdie(int  signo, char  *msg);
52 + static void printdefaults(void);
53  
54 +
55   int
56 < main(argc, argv)
116 < int  argc;
117 < char  *argv[];
56 > main(int  argc, char  *argv[])
57   {
58   #define  check(ol,al)           if (argv[i][ol] || \
59                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 126 | Line 65 | char  *argv[];
65                                  case 'n': case 'N': case 'f': case 'F': \
66                                  case '-': case '0': var = 0; break; \
67                                  default: goto badopt; }
129        int  loadflags = ~IO_FILES;
68          int  persist = 0;
69          char  **tralp;
70          int  duped1;
# Line 231 | Line 169 | char  *argv[];
169                                  }
170                                  if (argv[i][2] == 'I') {        /* file */
171                                          rval = wordfile(tralp,
172 <                                        getpath(argv[++i],getlibpath(),R_OK));
172 >                                        getpath(argv[++i],getrlibpath(),R_OK));
173                                          if (rval < 0) {
174                                                  sprintf(errmsg,
175                                  "cannot open trace include file \"%s\"",
# Line 253 | Line 191 | char  *argv[];
191                                  }
192                                  if (argv[i][2] == 'E') {        /* file */
193                                          rval = wordfile(tralp,
194 <                                        getpath(argv[++i],getlibpath(),R_OK));
194 >                                        getpath(argv[++i],getrlibpath(),R_OK));
195                                          if (rval < 0) {
196                                                  sprintf(errmsg,
197                                  "cannot open trace exclude file \"%s\"",
# Line 289 | Line 227 | char  *argv[];
227                                          /* initialize object types */
228          initotypes();
229                                          /* initialize urand */
230 <        initurand(2048);
230 >        if (rand_samp) {
231 >                srandom((long)time(0));
232 >                initurand(0);
233 >        } else {
234 >                srandom(0L);
235 >                initurand(2048);
236 >        }
237                                          /* set up signal handling */
238          sigdie(SIGINT, "Interrupt");
239 + #ifdef SIGHUP
240          sigdie(SIGHUP, "Hangup");
241 + #endif
242          sigdie(SIGTERM, "Terminate");
243 + #ifdef SIGPIPE
244          sigdie(SIGPIPE, "Broken pipe");
245 + #endif
246 + #ifdef SIGALRM
247          sigdie(SIGALRM, "Alarm clock");
248 + #endif
249   #ifdef  SIGXCPU
250          sigdie(SIGXCPU, "CPU limit exceeded");
251          sigdie(SIGXFSZ, "File size exceeded");
# Line 329 | Line 279 | char  *argv[];
279                  openheader();
280          }
281   #endif
332 #ifdef  MSDOS
282          if (outform != 'a')
283 <                setmode(fileno(stdout), O_BINARY);
335 <        if (octname == NULL)
336 <                setmode(fileno(stdin), O_BINARY);
337 < #endif
283 >                SET_FILE_BINARY(stdout);
284          readoct(octname, loadflags, &thescene, NULL);
285          nsceneobjs = nobjects;
286  
# Line 363 | Line 309 | char  *argv[];
309                          while ((rval=fork()) == 0) {    /* keep on forkin' */
310                                  pflock(1);
311                                  pfhold();
312 +                                ambsync();              /* load new values */
313                          }
314                          if (rval < 0)
315                                  error(SYSTEM, "cannot fork child for persist function");
316 <                        pfdetach();             /* parent exits */
316 >                        pfdetach();             /* parent will run then exit */
317                  }
318          }
319   runagain:
# Line 400 | Line 347 | runagain:
347   badopt:
348          sprintf(errmsg, "command line error at '%s'", argv[i]);
349          error(USER, errmsg);
350 +        return 1; /* pro forma return */
351  
352   #undef  check
353   #undef  bool
# Line 407 | Line 355 | badopt:
355  
356  
357   void
358 < wputs(s)                                /* warning output function */
359 < char    *s;
358 > wputs(                          /* warning output function */
359 >        char    *s
360 > )
361   {
362          int  lasterrno = errno;
363          eputs(s);
# Line 417 | Line 366 | char   *s;
366  
367  
368   void
369 < eputs(s)                                /* put string to stderr */
370 < register char  *s;
369 > eputs(                          /* put string to stderr */
370 >        register char  *s
371 > )
372   {
373          static int  midline = 0;
374  
# Line 436 | Line 386 | register char  *s;
386   }
387  
388  
389 < void
390 < onsig(signo)                            /* fatal signal */
391 < int  signo;
389 > static void
390 > onsig(                          /* fatal signal */
391 >        int  signo
392 > )
393   {
394          static int  gotsig = 0;
395  
396          if (gotsig++)                   /* two signals and we're gone! */
397                  _exit(signo);
398  
399 + #ifdef SIGALRM
400          alarm(15);                      /* allow 15 seconds to clean up */
401          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
402 + #endif
403          eputs("signal - ");
404          eputs(sigerr[signo]);
405          eputs("\n");
# Line 454 | Line 407 | int  signo;
407   }
408  
409  
410 < void
411 < sigdie(signo, msg)                      /* set fatal signal */
412 < int  signo;
413 < char  *msg;
410 > static void
411 > sigdie(                 /* set fatal signal */
412 >        int  signo,
413 >        char  *msg
414 > )
415   {
416          if (signal(signo, onsig) == SIG_IGN)
417                  signal(signo, SIG_IGN);
# Line 465 | Line 419 | char  *msg;
419   }
420  
421  
422 < void
423 < printdefaults()                 /* print default values to stdout */
422 > static void
423 > printdefaults(void)                     /* print default values to stdout */
424   {
425          register char  *cp;
426  
427          if (imm_irrad)
428                  printf("-I+\t\t\t\t# immediate irradiance on\n");
429 <        printf("-x  %-9d\t\t\t# x resolution\n", hresolu);
429 >        printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
430          printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
431          printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
432                          "-ld-\t\t\t\t# limit distance off\n");
433 +        printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
434 +                        loadflags & IO_INFO ? "output" : "no");
435          printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
436                          inform, outform, formstr(inform), formstr(outform));
437 <        printf("-o%s\t\t\t\t# output", outvals);
437 >        printf("-o%-9s\t\t\t# output", outvals);
438          for (cp = outvals; *cp; cp++)
439                  switch (*cp) {
440 <                case 't': printf(" trace"); break;
440 >                case 't': case 'T': printf(" trace"); break;
441                  case 'o': printf(" origin"); break;
442                  case 'd': printf(" direction"); break;
443                  case 'v': printf(" value"); break;
444 +                case 'V': printf(" contribution"); break;
445                  case 'l': printf(" length"); break;
446                  case 'L': printf(" first_length"); break;
447                  case 'p': printf(" point"); break;
# Line 492 | Line 449 | printdefaults()                        /* print default values to stdout */
449                  case 'N': printf(" unperturbed_normal"); break;
450                  case 's': printf(" surface"); break;
451                  case 'w': printf(" weight"); break;
452 +                case 'W': printf(" coefficient"); break;
453                  case 'm': printf(" modifier"); break;
454 +                case 'M': printf(" material"); break;
455 +                case '-': printf(" stroke"); break;
456                  }
457          putchar('\n');
458          printf(erract[WARNING].pf != NULL ?

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines