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.9 by schorsch, Tue Mar 30 16:13:01 2004 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  <sys/types.h>
11 > #include  <signal.h>
12  
13 + #include  "platform.h"
14 + #include  "rtprocess.h" /* getpid() */
15 + #include  "resolu.h"
16 + #include  "ray.h"
17   #include  "source.h"
68 –
18   #include  "ambient.h"
70 –
19   #include  "random.h"
72 –
20   #include  "paths.h"
21  
75 – #include  <sys/types.h>
76 –
77 – #include  <signal.h>
22                                          /* persistent processes define */
23   #ifdef  F_SETLKW
24   #define  PERSIST        1               /* normal persist */
# Line 83 | Line 27 | static const char      RCSid[] = "$Id$";
27   #endif
28  
29   char  *progname;                        /* argv[0] */
86 –
30   char  *octname;                         /* octree name */
88 –
31   char  *sigerr[NSIG];                    /* signal error messages */
90 –
32   char  *shm_boundary = NULL;             /* boundary of shared memory */
92 –
33   char  *errfile = NULL;                  /* error output file */
34  
35   extern char  *formstr();                /* string from format */
# Line 106 | Line 46 | extern int  lim_dist;                  /* limit distance? */
46   extern char  *tralist[];                /* list of modifers to trace (or no) */
47   extern int  traincl;                    /* include == 1, exclude == 0 */
48  
49 < void    onsig();
50 < void    sigdie();
51 < void    printdefaults();
49 > static void onsig(int  signo);
50 > static void sigdie(int  signo, char  *msg);
51 > static void printdefaults(void);
52  
53  
54   int
55 < main(argc, argv)
116 < int  argc;
117 < char  *argv[];
55 > main(int  argc, char  *argv[])
56   {
57   #define  check(ol,al)           if (argv[i][ol] || \
58                                  badarg(argc-i-1,argv+i+1,al)) \
# 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 292 | Line 230 | char  *argv[];
230          initurand(2048);
231                                          /* set up signal handling */
232          sigdie(SIGINT, "Interrupt");
233 + #ifdef SIGHUP
234          sigdie(SIGHUP, "Hangup");
235 + #endif
236          sigdie(SIGTERM, "Terminate");
237 + #ifdef SIGPIPE
238          sigdie(SIGPIPE, "Broken pipe");
239 + #endif
240 + #ifdef SIGALRM
241          sigdie(SIGALRM, "Alarm clock");
242 + #endif
243   #ifdef  SIGXCPU
244          sigdie(SIGXCPU, "CPU limit exceeded");
245          sigdie(SIGXFSZ, "File size exceeded");
# Line 329 | Line 273 | char  *argv[];
273                  openheader();
274          }
275   #endif
276 < #ifdef  MSDOS
276 > #ifdef  _WIN32
277          if (outform != 'a')
278 <                setmode(fileno(stdout), O_BINARY);
278 >                SET_FILE_BINARY(stdout);
279          if (octname == NULL)
280 <                setmode(fileno(stdin), O_BINARY);
280 >                SET_FILE_BINARY(stdin);
281   #endif
282          readoct(octname, loadflags, &thescene, NULL);
283          nsceneobjs = nobjects;
# Line 400 | Line 344 | runagain:
344   badopt:
345          sprintf(errmsg, "command line error at '%s'", argv[i]);
346          error(USER, errmsg);
347 +        return 1; /* pro forma return */
348  
349   #undef  check
350   #undef  bool
# Line 407 | Line 352 | badopt:
352  
353  
354   void
355 < wputs(s)                                /* warning output function */
356 < char    *s;
355 > wputs(                          /* warning output function */
356 >        char    *s
357 > )
358   {
359          int  lasterrno = errno;
360          eputs(s);
# Line 417 | Line 363 | char   *s;
363  
364  
365   void
366 < eputs(s)                                /* put string to stderr */
367 < register char  *s;
366 > eputs(                          /* put string to stderr */
367 >        register char  *s
368 > )
369   {
370          static int  midline = 0;
371  
# Line 436 | Line 383 | register char  *s;
383   }
384  
385  
386 < void
387 < onsig(signo)                            /* fatal signal */
388 < int  signo;
386 > static void
387 > onsig(                          /* fatal signal */
388 >        int  signo
389 > )
390   {
391          static int  gotsig = 0;
392  
393          if (gotsig++)                   /* two signals and we're gone! */
394                  _exit(signo);
395  
396 + #ifdef SIGALRM
397          alarm(15);                      /* allow 15 seconds to clean up */
398          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
399 + #endif
400          eputs("signal - ");
401          eputs(sigerr[signo]);
402          eputs("\n");
# Line 454 | Line 404 | int  signo;
404   }
405  
406  
407 < void
408 < sigdie(signo, msg)                      /* set fatal signal */
409 < int  signo;
410 < char  *msg;
407 > static void
408 > sigdie(                 /* set fatal signal */
409 >        int  signo,
410 >        char  *msg
411 > )
412   {
413          if (signal(signo, onsig) == SIG_IGN)
414                  signal(signo, SIG_IGN);
# Line 465 | Line 416 | char  *msg;
416   }
417  
418  
419 < void
420 < printdefaults()                 /* print default values to stdout */
419 > static void
420 > printdefaults(void)                     /* print default values to stdout */
421   {
422          register char  *cp;
423  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines