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.53 by greg, Sat Jan 21 22:04:02 2012 UTC vs.
Revision 2.55 by greg, Fri Nov 8 18:08:07 2013 UTC

# Line 37 | Line 37 | main(
37   #ifndef NFS
38   #define  NFS                    1
39   #endif
40 <                                /* set the following to 0 to forgo forking */
40 >
41 > #ifndef RHAS_FORK_EXEC
42 > #undef MAXFORK
43 > #define MAXFORK                 0
44 > #endif
45   #ifndef MAXFORK
46   #if NFS
47   #define  MAXFORK                3       /* allotment of duped processes */
# Line 101 | Line 105 | main(
105          char  *argv[]
106   )
107   {
108 <        register int  i, rval;
108 >        int  i, rval;
109          
110          progname = argv[0];
111          for (i = 1; i < argc; i++) {
# Line 235 | Line 239 | dolock(                /* lock or unlock a file */
239          if (fcntl(fd, F_SETLKW, &fls) < 0) {
240                  fprintf(stderr, "%s: cannot lock/unlock file: %s\n",
241                                  progname, strerror(errno));
242 <                exit(1);
242 >                _exit(1);
243          }
244   }
245  
# Line 392 | Line 396 | nextpiece(             /* get next piece assignment */
396  
397   static int
398   rvrpiece(               /* check for recoverable pieces */
399 <        register int    *xp,
400 <        register int    *yp
399 >        int     *xp,
400 >        int     *yp
401   )
402   {
403          static char  *pdone = NULL;     /* which pieces are done */
404          static long  readpos = -1;      /* how far we've read */
405 <        register int  i;
405 >        int  i;
406          /*
407           * This routine is called by nextpiece() with an
408           * exclusive lock on syncfp and the file pointer at the
# Line 522 | Line 526 | int    ypos
526          struct flock  fls;
527          int  pid, status;
528          int  hr, vr;
529 <        register int  y;
529 >        int  y;
530                                  /* check bounds */
531          if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) {
532                  fprintf(stderr, "%s: requested piece (%d,%d) out of range\n",
# Line 573 | Line 577 | int    ypos
577                                  /* lock file section so NFS doesn't mess up */
578          fls.l_whence = 0;
579          fls.l_type = F_WRLCK;
580 + #if 0
581          if (fcntl(outfd, F_SETLKW, &fls) < 0)
582                  filerr("lock");
583 + #else
584 +        dolock(outfd, F_WRLCK);
585   #endif
586 + #endif
587                                  /* write new piece to file */
588          if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0)
589                  filerr("seek");
# Line 595 | Line 603 | int    ypos
603                  }
604   #if NFS
605          fls.l_type = F_UNLCK;           /* release lock */
606 + #if 0
607          if (fcntl(outfd, F_SETLKW, &fls) < 0)
608                  filerr("lock");
609 + #else
610 +        dolock(outfd, F_UNLCK);
611 + #endif
612   #endif
613          if (verbose) {                          /* notify caller */
614                  printf("%d %d done\n", xpos, ypos);

Diff Legend

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