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.15 by greg, Wed Aug 7 05:10:09 2013 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  <time.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();
117 < void    sigdie();
118 < void    printdefaults();
52 > extern double  dblur;                   /* depth-of-field blur parameter */
53  
54 + static void onsig(int signo);
55 + static void sigdie(int  signo, char  *msg);
56 + static void printdefaults(void);
57  
58 +
59   int
60 < main(argc, argv)
123 < int  argc;
124 < char  *argv[];
60 > main(int  argc, char  *argv[])
61   {
62   #define  check(ol,al)           if (argv[i][ol] || \
63                                  badarg(argc-i-1,argv+i+1,al)) \
# Line 140 | Line 76 | char  *argv[];
76          int  loadflags = ~IO_FILES;
77          int  seqstart = 0;
78          int  persist = 0;
79 <        int  duped1;
79 >        int  duped1 = -1;
80          int  rval;
81          int  i;
82                                          /* record start time */
# Line 218 | Line 154 | char  *argv[];
154                                  check(3,"f");
155                                  mblur = atof(argv[++i]);
156                                  break;
157 +                        case 'd':                               /* aperture */
158 +                                check(3,"f");
159 +                                dblur = atof(argv[++i]);
160 +                                break;
161                          default:
162                                  goto badopt;
163                          }
# Line 286 | Line 226 | char  *argv[];
226                                          /* initialize object types */
227          initotypes();
228                                          /* initialize urand */
229 <        initurand(2048);
229 >        if (rand_samp) {
230 >                srandom((long)time(0));
231 >                initurand(0);
232 >        } else {
233 >                srandom(0L);
234 >                initurand(2048);
235 >        }
236                                          /* set up signal handling */
237          sigdie(SIGINT, "Interrupt");
238 + #ifdef SIGHUP
239          sigdie(SIGHUP, "Hangup");
240 + #endif
241          sigdie(SIGTERM, "Terminate");
242 + #ifdef SIGPIPE
243          sigdie(SIGPIPE, "Broken pipe");
244 + #endif
245 + #ifdef SIGALRM
246          sigdie(SIGALRM, "Alarm clock");
247 + #endif
248   #ifdef  SIGXCPU
249          sigdie(SIGXCPU, "CPU limit exceeded");
250          sigdie(SIGXFSZ, "File size exceeded");
# Line 333 | Line 285 | char  *argv[];
285   #endif
286          if (outfile != NULL)
287                  openheader();
288 < #ifdef  MSDOS
289 <        setmode(fileno(stdout), O_BINARY);
288 > #ifdef  _WIN32
289 >        SET_FILE_BINARY(stdout);
290          if (octname == NULL)
291 <                setmode(fileno(stdin), O_BINARY);
291 >                SET_FILE_BINARY(stdin);
292   #endif
293          readoct(octname, loadflags, &thescene, NULL);
294          nsceneobjs = nobjects;
# Line 344 | Line 296 | char  *argv[];
296          if (loadflags & IO_INFO) {      /* print header */
297                  printargs(i, argv, stdout);
298                  printf("SOFTWARE= %s\n", VersionID);
347 –                fputnow(stdout);
299          }
300  
301          marksources();                  /* find and mark sources */
# Line 366 | Line 317 | char  *argv[];
317                                  pflock(1);
318                                  pfhold();
319                                  tstart = time((time_t *)NULL);
320 +                                ambsync();              /* load new values */
321                          }
322                          if (rval < 0)
323                                  error(SYSTEM, "cannot fork child for persist function");
324 <                        pfdetach();             /* parent exits */
324 >                        pfdetach();             /* parent will run then exit */
325                  }
326          }
327   runagain:
328 <        if (persist)
328 >        if (persist) {
329                  if (outfile == NULL)                    /* if out to stdout */
330                          dupheader();                    /* send header */
331                  else                                    /* if out to file */
332                          duped1 = dup(fileno(stdout));   /* hang onto pipe */
333 +        }
334   #endif
335                                          /* batch render picture(s) */
336          rpict(seqstart, outfile, zfile, recover);
# Line 408 | Line 361 | runagain:
361   badopt:
362          sprintf(errmsg, "command line error at '%s'", argv[i]);
363          error(USER, errmsg);
364 +        return 1; /* pro forma return */
365  
366   #undef  check
367   #undef  bool
# Line 415 | Line 369 | badopt:
369  
370  
371   void
372 < wputs(s)                                /* warning output function */
373 < char    *s;
372 > wputs(                          /* warning output function */
373 >        char    *s
374 > )
375   {
376          int  lasterrno = errno;
377          eputs(s);
# Line 425 | Line 380 | char   *s;
380  
381  
382   void
383 < eputs(s)                                /* put string to stderr */
384 < register char  *s;
383 > eputs(                          /* put string to stderr */
384 >        register char  *s
385 > )
386   {
387          static int  midline = 0;
388  
# Line 444 | Line 400 | register char  *s;
400   }
401  
402  
403 < void
404 < onsig(signo)                            /* fatal signal */
405 < int  signo;
403 > static void
404 > onsig(                          /* fatal signal */
405 >        int  signo
406 > )
407   {
408          static int  gotsig = 0;
409  
410          if (gotsig++)                   /* two signals and we're gone! */
411                  _exit(signo);
412  
413 + #ifdef SIGALRM /* XXX how critical is this? */
414          alarm(15);                      /* allow 15 seconds to clean up */
415          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
416 + #endif
417          eputs("signal - ");
418          eputs(sigerr[signo]);
419          eputs("\n");
# Line 462 | Line 421 | int  signo;
421   }
422  
423  
424 < void
425 < sigdie(signo, msg)                      /* set fatal signal */
426 < int  signo;
427 < char  *msg;
424 > static void
425 > sigdie(                 /* set fatal signal */
426 >        int  signo,
427 >        char  *msg
428 > )
429   {
430          if (signal(signo, onsig) == SIG_IGN)
431                  signal(signo, SIG_IGN);
# Line 473 | Line 433 | char  *msg;
433   }
434  
435  
436 < void
437 < printdefaults()                 /* print default values to stdout */
436 > static void
437 > printdefaults(void)                     /* print default values to stdout */
438   {
479 –        register char  *cp;
480 –
439          printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,
440                          ourview.type==VT_PER ? "perspective" :
441                          ourview.type==VT_PAR ? "parallel" :
442                          ourview.type==VT_HEM ? "hemispherical" :
443                          ourview.type==VT_ANG ? "angular" :
444                          ourview.type==VT_CYL ? "cylindrical" :
445 +                        ourview.type==VT_PLS ? "planisphere" :
446                          "unknown");
447          printf("-vp %f %f %f\t# view point\n",
448                          ourview.vp[0], ourview.vp[1], ourview.vp[2]);
# Line 502 | Line 461 | printdefaults()                        /* print default values to stdout */
461          printf("-pa %f\t\t\t# pixel aspect ratio\n", pixaspect);
462          printf("-pj %f\t\t\t# pixel jitter\n", dstrpix);
463          printf("-pm %f\t\t\t# pixel motion\n", mblur);
464 +        printf("-pd %f\t\t\t# pixel depth-of-field\n", dblur);
465          printf("-ps %-9d\t\t\t# pixel sample\n", psample);
466          printf("-pt %f\t\t\t# pixel threshold\n", maxdiff);
467          printf("-t  %-9d\t\t\t# time between reports\n", ralrm);

Diff Legend

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