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

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.38 by schorsch, Sun Jun 8 12:03:11 2003 UTC vs.
Revision 2.45 by schorsch, Sat Oct 23 18:55:53 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Generate sections of a picture.
6   */
7  
8 +
9 + #include <stdio.h>
10 + #include <signal.h>
11 + #include <sys/types.h>
12 + #ifndef NON_POSIX /* XXX need abstraction for process management */
13 + #include <sys/wait.h>
14 + #endif
15 +
16 + #include "platform.h"
17   #include "standard.h"
18 + #include "color.h"
19 + #include "view.h"
20 + #include "rtprocess.h"
21  
22   #ifndef F_SETLKW
23  
24 < main(argc, argv)
25 < int argc;
26 < char *argv[];
24 > int
25 > main(
26 >        int argc,
27 >        char *argv[]
28 > )
29   {
30          fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]);
31          exit(1);
# Line 19 | Line 33 | char *argv[];
33  
34   #else
35  
22 – #include <signal.h>
23 – #include "color.h"
24 – #include "view.h"
25 –
36   #ifndef NFS
37   #define  NFS                    1
38   #endif
# Line 40 | Line 50 | char *argv[];
50   #define unguard()       sigrelse(SIGALRM)
51   #endif
52   #ifndef guard_io
53 < #define guard_io()      0
54 < #define unguard()       0
53 > #define guard_io()      
54 > #define unguard()      
55   #endif
56  
57   extern char  *strerror();
# Line 49 | Line 59 | extern char  *strerror();
59                                  /* rpict command */
60   char  *rpargv[128] = {"rpict", "-S", "1"};
61   int  rpargc = 3;
52 – int  rpd[3];
62   FILE  *torp, *fromrp;
63   COLR  *pbuf;
64                                  /* our view parameters */
# Line 74 | Line 83 | int  rvrlim = -1;
83   int  gotalrm = 0;
84   void  onalrm(int i) { gotalrm++; }
85  
86 + static void dolock(int  fd, int  ltyp);
87 + static void init(int  ac, char  **av);
88 + static int nextpiece(int        *xp, int        *yp);
89 + static int rvrpiece(int *xp, int        *yp);
90 + static int cleanup(int  rstat);
91 + static void rpiece(void);
92 + static int putpiece(int xpos, int       ypos);
93 + static void filerr(char  *t);
94  
95 < main(argc, argv)
96 < int  argc;
97 < char  *argv[];
95 >
96 > int
97 > main(
98 >        int  argc,
99 >        char  *argv[]
100 > )
101   {
102          register int  i, rval;
103          
# Line 186 | Line 206 | char  *argv[];
206   }
207  
208  
209 < dolock(fd, ltyp)                /* lock or unlock a file */
210 < int  fd;
211 < int  ltyp;
209 > static void
210 > dolock(         /* lock or unlock a file */
211 >        int  fd,
212 >        int  ltyp
213 > )
214   {
215          static struct flock  fls;       /* static so initialized to zeroes */
216  
# Line 201 | Line 223 | int  ltyp;
223   }
224  
225  
226 < init(ac, av)                    /* set up output file and start rpict */
227 < int  ac;
228 < char  **av;
226 > static void
227 > init(                   /* set up output file and start rpict */
228 >        int  ac,
229 >        char  **av
230 > )
231   {
232          static char  hrbuf[16], vrbuf[16];
233          extern char  VersionID[];
234          char  *err;
235          FILE  *fp;
236          int  hr, vr;
237 +        SUBPROC  rpd; /* since we don't close_process(), this can be local */
238                                          /* set up view */
239          if ((err = setview(&ourview)) != NULL) {
240                  fprintf(stderr, "%s: %s\n", progname, err);
# Line 268 | Line 293 | char  **av;
293                  goto filerr;
294          dolock(outfd, F_UNLCK);
295                                          /* start rpict process */
296 <        if (open_process(rpd, rpargv) <= 0) {
296 >        if (open_process(&rpd, rpargv) <= 0) {
297                  fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
298                  exit(1);
299          }
300 <        if ((fromrp = fdopen(rpd[0], "r")) == NULL ||
301 <                        (torp = fdopen(rpd[1], "w")) == NULL) {
300 >        if ((fromrp = fdopen(rpd.r, "r")) == NULL ||
301 >                        (torp = fdopen(rpd.w, "w")) == NULL) {
302                  fprintf(stderr, "%s: cannot open stream to %s\n",
303                                  progname, rpargv[0]);
304                  exit(1);
# Line 292 | Line 317 | filerr:
317   }
318  
319  
320 < int
321 < nextpiece(xp, yp)               /* get next piece assignment */
322 < int  *xp, *yp;
320 > static int
321 > nextpiece(              /* get next piece assignment */
322 >        int     *xp,
323 >        int     *yp
324 > )
325   {
326          if (gotalrm)                    /* someone wants us to quit */
327                  return(0);
# Line 334 | Line 361 | int  *xp, *yp;
361   }
362  
363  
364 < int
365 < rvrpiece(xp, yp)                /* check for recoverable pieces */
366 < register int  *xp, *yp;
364 > static int
365 > rvrpiece(               /* check for recoverable pieces */
366 >        register int    *xp,
367 >        register int    *yp
368 > )
369   {
370          static char  *pdone = NULL;     /* which pieces are done */
371          static long  readpos = -1;      /* how far we've read */
# Line 378 | Line 407 | register int  *xp, *yp;
407   }
408  
409  
410 < int
411 < cleanup(rstat)                  /* close rpict process and clean up */
412 < int  rstat;
410 > static int
411 > cleanup(                        /* close rpict process and clean up */
412 >        int  rstat
413 > )
414   {
415          int  status;
416  
# Line 394 | Line 424 | int  rstat;
424   }
425  
426  
427 < rpiece()                        /* render picture piece by piece */
427 > static void
428 > rpiece(void)                    /* render picture piece by piece */
429   {
430          VIEW  pview;
431          int  xorg, yorg;
432                                          /* compute view parameters */
433 <        copystruct(&pview, &ourview);
433 >        pview = ourview;
434          switch (ourview.type) {
435          case VT_PER:
436                  pview.horiz = 2.*180./PI*atan(
# Line 441 | Line 472 | rpiece()                       /* render picture piece by piece */
472   }
473  
474  
475 < int
476 < putpiece(xpos, ypos)            /* get next piece from rpict */
477 < int  xpos, ypos;
475 > static int
476 > putpiece(               /* get next piece from rpict */
477 > int     xpos,
478 > int     ypos
479 > )
480   {
481          struct flock  fls;
482          int  pid, status;
483          int  hr, vr;
484          register int  y;
485                                  /* check bounds */
486 <        if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) {
486 >        if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
487                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
488                                  progname, xpos, ypos);
489                  exit(cleanup(1));
# Line 458 | Line 491 | int  xpos, ypos;
491                                  /* check header from rpict */
492          guard_io();
493          getheader(fromrp, NULL, NULL);
494 <        if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
494 >        if (!fscnresolu(&hr, &vr, fromrp) || (hr != hres) | (vr != vres)) {
495                  fprintf(stderr, "%s: resolution mismatch from %s\n",
496                                  progname, rpargv[0]);
497                  exit(cleanup(1));
# Line 503 | Line 536 | int  xpos, ypos;
536                  filerr("lock");
537   #endif
538                                  /* write new piece to file */
539 <        if (lseek(outfd, (off_t)fls.l_start, 0) < 0)
539 >        if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
540                  filerr("seek");
541          if (hmult == 1) {
542                  if (writebuf(outfd, (char *)pbuf,
# Line 516 | Line 549 | int  xpos, ypos;
549                                  filerr("write");
550                          if (y < vr-1 && lseek(outfd,
551                                          (off_t)(hmult-1)*hr*sizeof(COLR),
552 <                                        1) < 0)
552 >                                        SEEK_CUR) < 0)
553                                  filerr("seek");
554                  }
555   #if NFS
# Line 542 | Line 575 | int  xpos, ypos;
575   }
576  
577  
578 < filerr(t)                       /* report file error and exit */
579 < char  *t;
578 > static void
579 > filerr(                 /* report file error and exit */
580 >        char  *t
581 > )
582   {
583          fprintf(stderr, "%s: %s error on file \"%s\": %s\n",
584                          progname, t, outfile, strerror(errno));

Diff Legend

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