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

Comparing ray/src/rt/rpmain.c (file contents):
Revision 2.1 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.8 by schorsch, Tue Mar 30 16:13:01 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rpmain.c - main for rpict batch rendering 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  "ray.h"
16   #include  "source.h"
68 –
17   #include  "ambient.h"
70 –
18   #include  "random.h"
72 –
19   #include  "paths.h"
74 –
75 – #include  <sys/types.h>
76 –
77 – #include  <signal.h>
78 –
20   #include  "view.h"
21  
81 – #include  "paths.h"
22                                          /* persistent processes define */
23   #ifdef  F_SETLKW
24   #define  PERSIST        1               /* normal persist */
# Line 87 | Line 27 | static const char      RCSid[] = "$Id$";
27   #endif
28  
29   char  *progname;                        /* argv[0] */
90 –
30   char  *octname;                         /* octree name */
92 –
31   char  *sigerr[NSIG];                    /* signal error messages */
94 –
32   char  *shm_boundary = NULL;             /* boundary of shared memory */
96 –
33   char  *errfile = NULL;                  /* error output file */
34  
35   extern time_t  time();
# Line 113 | Line 49 | extern double  dstrpix;                        /* square pixel distribution
49  
50   extern double  mblur;                   /* motion blur parameter */
51  
52 < void    onsig();
53 < void    sigdie();
54 < void    printdefaults();
52 > static void onsig(int signo);
53 > static void sigdie(int  signo, char  *msg);
54 > static void printdefaults(void);
55  
56  
57   int
58 < main(argc, argv)
123 < int  argc;
124 < char  *argv[];
58 > main(int  argc, char  *argv[])
59   {
60   #define  check(ol,al)           if (argv[i][ol] || \
61                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 289 | Line 223 | char  *argv[];
223          initurand(2048);
224                                          /* set up signal handling */
225          sigdie(SIGINT, "Interrupt");
226 + #ifdef SIGHUP
227          sigdie(SIGHUP, "Hangup");
228 + #endif
229          sigdie(SIGTERM, "Terminate");
230 + #ifdef SIGPIPE
231          sigdie(SIGPIPE, "Broken pipe");
232 + #endif
233 + #ifdef SIGALRM
234          sigdie(SIGALRM, "Alarm clock");
235 + #endif
236   #ifdef  SIGXCPU
237          sigdie(SIGXCPU, "CPU limit exceeded");
238          sigdie(SIGXFSZ, "File size exceeded");
# Line 333 | Line 273 | char  *argv[];
273   #endif
274          if (outfile != NULL)
275                  openheader();
276 < #ifdef  MSDOS
277 <        setmode(fileno(stdout), O_BINARY);
276 > #ifdef  _WIN32
277 >        SET_FILE_BINARY(stdout);
278          if (octname == NULL)
279 <                setmode(fileno(stdin), O_BINARY);
279 >                SET_FILE_BINARY(stdin);
280   #endif
281          readoct(octname, loadflags, &thescene, NULL);
282          nsceneobjs = nobjects;
# Line 344 | Line 284 | char  *argv[];
284          if (loadflags & IO_INFO) {      /* print header */
285                  printargs(i, argv, stdout);
286                  printf("SOFTWARE= %s\n", VersionID);
347 –                fputnow(stdout);
287          }
288  
289          marksources();                  /* find and mark sources */
# Line 373 | Line 312 | char  *argv[];
312                  }
313          }
314   runagain:
315 <        if (persist)
315 >        if (persist) {
316                  if (outfile == NULL)                    /* if out to stdout */
317                          dupheader();                    /* send header */
318                  else                                    /* if out to file */
319                          duped1 = dup(fileno(stdout));   /* hang onto pipe */
320 +        }
321   #endif
322                                          /* batch render picture(s) */
323          rpict(seqstart, outfile, zfile, recover);
# Line 408 | Line 348 | runagain:
348   badopt:
349          sprintf(errmsg, "command line error at '%s'", argv[i]);
350          error(USER, errmsg);
351 +        return 1; /* pro forma return */
352  
353   #undef  check
354   #undef  bool
# Line 415 | Line 356 | badopt:
356  
357  
358   void
359 < wputs(s)                                /* warning output function */
360 < char    *s;
359 > wputs(                          /* warning output function */
360 >        char    *s
361 > )
362   {
363          int  lasterrno = errno;
364          eputs(s);
# Line 425 | Line 367 | char   *s;
367  
368  
369   void
370 < eputs(s)                                /* put string to stderr */
371 < register char  *s;
370 > eputs(                          /* put string to stderr */
371 >        register char  *s
372 > )
373   {
374          static int  midline = 0;
375  
# Line 444 | Line 387 | register char  *s;
387   }
388  
389  
390 < void
391 < onsig(signo)                            /* fatal signal */
392 < int  signo;
390 > static void
391 > onsig(                          /* fatal signal */
392 >        int  signo
393 > )
394   {
395          static int  gotsig = 0;
396  
397          if (gotsig++)                   /* two signals and we're gone! */
398                  _exit(signo);
399  
400 + #ifdef SIGALRM /* XXX how critical is this? */
401          alarm(15);                      /* allow 15 seconds to clean up */
402          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
403 + #endif
404          eputs("signal - ");
405          eputs(sigerr[signo]);
406          eputs("\n");
# Line 462 | Line 408 | int  signo;
408   }
409  
410  
411 < void
412 < sigdie(signo, msg)                      /* set fatal signal */
413 < int  signo;
414 < char  *msg;
411 > static void
412 > sigdie(                 /* set fatal signal */
413 >        int  signo,
414 >        char  *msg
415 > )
416   {
417          if (signal(signo, onsig) == SIG_IGN)
418                  signal(signo, SIG_IGN);
# Line 473 | Line 420 | char  *msg;
420   }
421  
422  
423 < void
424 < printdefaults()                 /* print default values to stdout */
423 > static void
424 > printdefaults(void)                     /* print default values to stdout */
425   {
479 –        register char  *cp;
480 –
426          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
427                          ourview.type==VT_PER ? "perspective" :
428                          ourview.type==VT_PAR ? "parallel" :

Diff Legend

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