--- ray/src/util/rpiece.c 1993/01/21 17:46:31 2.15 +++ ray/src/util/rpiece.c 1993/08/06 12:58:43 2.24 @@ -1,4 +1,4 @@ -/* Copyright (c) 1992 Regents of the University of California */ +/* Copyright (c) 1993 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -10,6 +10,19 @@ static char SCCSid[] = "$SunId$ LBL"; #include "standard.h" #include + +#ifndef F_SETLKW + +main(argc, argv) +int argc; +char *argv[]; +{ + fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]); + exit(1); +} + +#else + #include #include "color.h" #include "view.h" @@ -26,17 +39,25 @@ static char SCCSid[] = "$SunId$ LBL"; #define MAXFORK 0 #endif #endif - + /* protection from SYSV signals(!) */ +#if defined(sgi) || defined(hpux) +#define guard_io() sighold(SIGALRM) +#define unguard() sigrelse(SIGALRM) +#endif +#ifndef guard_io +#define guard_io() 0 +#define unguard() 0 +#endif /* rpict command */ -char *rpargv[128] = {"rpict", "-S", "1", "-x", "512", "-y", "512", "-pa", "1"}; -int rpargc = 9; +char *rpargv[128] = {"rpict", "-S", "1"}; +int rpargc = 3; int rpd[3]; FILE *torp, *fromrp; COLR *pbuf; /* our view parameters */ VIEW ourview = STDVIEW; double pixaspect = 1.0; -int hres = 512, vres = 512, hmult = 2, vmult = 2; +int hres = 1024, vres = 1024, hmult = 4, vmult = 4; /* output file */ char *outfile = NULL; int outfd; @@ -61,6 +82,13 @@ char *argv[]; progname = argv[0]; for (i = 1; i < argc; i++) { + /* expand arguments */ + while (rval = expandarg(&argc, &argv, i)) + if (rval < 0) { + fprintf(stderr, "%s: cannot expand '%s'", + argv[0], argv[i]); + exit(1); + } if (argv[i][0] == '-') switch (argv[i][1]) { case 'v': @@ -85,17 +113,20 @@ char *argv[]; } break; case 'p': /* pixel aspect ratio? */ - if (argv[i][2] == 'a' && !argv[i][3]) - pixaspect = atof(argv[i+1]); - break; - case 'x': /* piece x resolution */ - if (!argv[i][2]) - hres = atoi(argv[i+1]); - break; - case 'y': /* piece y resolution */ - if (!argv[i][2]) - vres = atoi(argv[i+1]); - break; + if (argv[i][2] != 'a' || argv[i][3]) + break; + pixaspect = atof(argv[i+1]); + continue; + case 'x': /* overall x resolution */ + if (argv[i][2]) + break; + hres = atoi(argv[++i]); + continue; + case 'y': /* overall y resolution */ + if (argv[i][2]) + break; + vres = atoi(argv[++i]); + continue; case 'X': /* horizontal multiplier */ if (argv[i][2]) break; @@ -125,10 +156,14 @@ char *argv[]; break; outfile = argv[++i]; continue; - } + } else if (i >= argc-1) + break; rpargv[rpargc++] = argv[i]; } - rpargv[rpargc] = NULL; + if (i >= argc) { + fprintf(stderr, "%s: missing octree argument\n", argv[0]); + exit(1); + } if (outfile == NULL) { fprintf(stderr, "%s: missing output file\n", argv[0]); exit(1); @@ -143,6 +178,7 @@ init(ac, av) /* set up output file and start rpict * int ac; char **av; { + static char hrbuf[16], vrbuf[16]; extern char VersionID[]; char *err; FILE *fp; @@ -157,7 +193,17 @@ char **av; buf[read(syncfd, buf, sizeof(buf)-1)] = '\0'; sscanf(buf, "%d %d", &hmult, &vmult); } + /* compute piece size */ + hres /= hmult; + vres /= vmult; normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); + sprintf(hrbuf, "%d", hres); + rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf; + sprintf(vrbuf, "%d", vres); + rpargv[rpargc++] = "-y"; rpargv[rpargc++] = vrbuf; + rpargv[rpargc++] = "-pa"; rpargv[rpargc++] = "0"; + rpargv[rpargc++] = av[ac-1]; + rpargv[rpargc] = NULL; /* open output file */ if ((outfd = open(outfile, O_WRONLY|O_CREAT|O_EXCL, 0666)) >= 0) { if ((fp = fdopen(dup(outfd), "w")) == NULL) @@ -204,7 +250,7 @@ char **av; progname, rpargv[0]); exit(1); } - if ((pbuf = (COLR *)malloc(hres*vres*sizeof(COLR))) == NULL) { + if ((pbuf = (COLR *)bmalloc(hres*vres*sizeof(COLR))) == NULL) { fprintf(stderr, "%s: out of memory\n", progname); exit(1); } @@ -220,7 +266,6 @@ int nextpiece(xp, yp) /* get next piece assignment */ int *xp, *yp; { - extern char *fgets(); struct flock fls; char buf[64]; @@ -245,7 +290,7 @@ int *xp, *yp; return(0); } } - sprintf(buf, "%d %d\n%d %d\n", hmult, vmult, *xp, *yp); + sprintf(buf, "%4d %4d\n%4d %4d\n", hmult, vmult, *xp, *yp); lseek(syncfd, 0L, 0); /* write new position */ write(syncfd, buf, strlen(buf)); fls.l_type = F_UNLCK; /* release sync file */ @@ -267,7 +312,7 @@ int rstat; { int status; - free((char *)pbuf); + bfree((char *)pbuf, hres*vres*sizeof(COLR)); fclose(torp); fclose(fromrp); while (wait(&status) != -1) @@ -315,10 +360,6 @@ rpiece() /* render picture piece by piece */ putc('\n', torp); fflush(torp); /* assigns piece to rpict */ putpiece(xorg, yorg); /* place piece in output */ - if (verbose) { /* notify caller */ - printf("%d %d done\n", xorg, yorg); - fflush(stdout); - } } } @@ -338,19 +379,28 @@ int xpos, ypos; exit(cleanup(1)); } /* check header from rpict */ + guard_io(); getheader(fromrp, NULL, NULL); if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) { fprintf(stderr, "%s: resolution mismatch from %s\n", progname, rpargv[0]); exit(cleanup(1)); } + if (verbose) { /* notify caller */ + printf("%d %d begun\n", xpos, ypos); + fflush(stdout); + } + unguard(); /* load new piece into buffer */ - for (y = 0; y < vr; y++) + for (y = 0; y < vr; y++) { + guard_io(); if (freadcolrs(pbuf+y*hr, hr, fromrp) < 0) { fprintf(stderr, "%s: read error from %s\n", progname, rpargv[0]); exit(cleanup(1)); } + unguard(); + } #if MAXFORK /* fork so we don't slow rpict down */ if ((pid = fork()) > 0) { @@ -365,16 +415,17 @@ int xpos, ypos; #else pid = -1; /* no forking */ #endif - fls.l_len = (long)vres*hmult*hres*sizeof(COLR); - fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len; + fls.l_start = scanorig + + ((long)(vmult-1-ypos)*vres*hmult+xpos)*hres*sizeof(COLR); #if NFS + fls.l_len = ((long)(vres-1)*hmult+1)*hres*sizeof(COLR); /* lock file section so NFS doesn't mess up */ fls.l_whence = 0; fls.l_type = F_WRLCK; fcntl(outfd, F_SETLKW, &fls); #endif /* write new piece to file */ - if (lseek(outfd, fls.l_start+(long)xpos*hres*sizeof(COLR), 0) == -1) + if (lseek(outfd, fls.l_start, 0) == -1) goto seekerr; if (hmult == 1) { if (writebuf(outfd, (char *)pbuf, @@ -390,7 +441,11 @@ int xpos, ypos; 1) == -1) goto seekerr; } - if (pid == -1) { /* fork failed */ + if (verbose) { /* notify caller */ + printf("%d %d done\n", xpos, ypos); + fflush(stdout); + } + if (pid == -1) { /* didn't fork or fork failed */ #if NFS fls.l_type = F_UNLCK; /* release lock */ fcntl(outfd, F_SETLKW, &fls); @@ -405,3 +460,5 @@ writerr: fprintf(stderr, "%s: write error on file \"%s\"\n", progname, outfile); _exit(1); } + +#endif