--- ray/src/util/rpiece.c 1992/08/06 17:16:29 2.2 +++ ray/src/util/rpiece.c 1992/08/09 23:05:17 2.11 @@ -10,31 +10,42 @@ static char SCCSid[] = "$SunId$ LBL"; #include "standard.h" #include +#include #include "color.h" #include "view.h" #include "resolu.h" + /* set the following to 0 to forgo forking */ +#ifndef MAXFORK +#define MAXFORK 3 /* allotment of duped processes */ +#endif + /* rpict command */ -char *rpargv[128] = {"rpict", "-S", "1", "-x", "512", "-y", "512", }; -int rpargc = 7; +char *rpargv[128] = {"rpict", "-S", "1", "-x", "512", "-y", "512", "-pa", "1"}; +int rpargc = 9; int rpd[3]; FILE *torp, *fromrp; -COLR *scanline; +COLR *pbuf; /* our view parameters */ VIEW ourview = STDVIEW; -double pixaspect = 0.0; +double pixaspect = 1.0; int hres = 512, vres = 512, hmult = 2, vmult = 2; /* output file */ char *outfile = NULL; int outfd; long scanorig; +int syncfd = -1; /* lock file descriptor */ +int nforked = 0; char *progname; int verbose = 0; extern long lseek(), ftell(); +int gotalrm = 0; +int onalrm() { gotalrm++; } + main(argc, argv) int argc; char *argv[]; @@ -88,6 +99,15 @@ char *argv[]; break; vmult = atoi(argv[++i]); continue; + case 'F': /* syncronization file */ + if (argv[i][2]) + break; + if ((syncfd = open(argv[++i], O_RDWR)) < 0) { + fprintf(stderr, "%s: cannot open\n", + argv[i]); + exit(1); + } + continue; case 'o': /* output file */ if (argv[i][2]) break; @@ -103,7 +123,7 @@ char *argv[]; } init(argc, argv); rpiece(); - rval = cleanup(); + rval = cleanup(0); exit(rval); } @@ -121,6 +141,11 @@ char **av; fprintf(stderr, "%s: %s\n", progname, err); exit(1); } + if (syncfd != -1) { + char buf[32]; + buf[read(syncfd, buf, sizeof(buf)-1)] = '\0'; + sscanf(buf, "%d %d", &hmult, &vmult); + } normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); /* open output file */ if ((outfd = open(outfile, O_WRONLY|O_CREAT|O_EXCL, 0666)) >= 0) { @@ -137,26 +162,27 @@ char **av; putc('\n', fp); fprtresolu(hres*hmult, vres*vmult, fp); } else if ((outfd = open(outfile, O_RDWR)) >= 0) { - sleep(30); /* wait for header */ if ((fp = fdopen(dup(outfd), "r+")) == NULL) goto filerr; getheader(fp, NULL); /* skip header */ if (fscnresolu(&hr, &vr, fp) < 0 || /* check resolution */ hr != hres*hmult || vr != vres*vmult) { - fprintf(stderr, "%s: picture resolution mismatch\n", - outfile); + fprintf(stderr, "%s: resolution mismatch on file \"%s\"\n", + progname, outfile); exit(1); } } else { - fprintf(stderr, "%s: cannot open\n", outfile); + fprintf(stderr, "%s: cannot open file \"%s\"\n", + progname, outfile); exit(1); } scanorig = ftell(fp); /* record position of first scanline */ if (fclose(fp) == -1) /* done with stream i/o */ goto filerr; + sync(); /* flush NFS buffers */ /* start rpict process */ if (open_process(rpd, rpargv) <= 0) { - fprintf(stderr, "%s: cannot start\n", rpargv[0]); + fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]); exit(1); } if ((fromrp = fdopen(rpd[0], "r")) == NULL || @@ -165,107 +191,200 @@ char **av; progname, rpargv[0]); exit(1); } - if ((scanline = (COLR *)malloc(hres*sizeof(COLR))) == NULL) { + if ((pbuf = (COLR *)malloc(hres*vres*sizeof(COLR))) == NULL) { fprintf(stderr, "%s: out of memory\n", progname); exit(1); } + signal(SIGALRM, onalrm); return; filerr: - fprintf(stderr, "%s: file i/o error\n", outfile); + fprintf(stderr, "%s: i/o error on file \"%s\"\n", progname, outfile); exit(1); } int -cleanup() /* close rpict process and clean up */ +nextpiece(xp, yp) /* get next piece assignment */ +int *xp, *yp; { - register int rpstat; + extern char *fgets(); + struct flock fls; + char buf[64]; - free((char *)scanline); + if (gotalrm) /* someone wants us to quit */ + return(0); + if (syncfd != -1) { /* use sync file */ + fls.l_type = F_WRLCK; /* gain exclusive access */ + fls.l_whence = 0; + fls.l_start = 0L; + fls.l_len = 0L; + fcntl(syncfd, F_SETLKW, &fls); + lseek(syncfd, 0L, 0); + buf[read(syncfd, buf, sizeof(buf)-1)] = '\0'; + if (sscanf(buf, "%*d %*d %d %d", xp, yp) < 2) { + *xp = hmult-1; + *yp = vmult; + } + if (--(*yp) < 0) { /* decrement position */ + *yp = vmult-1; + if (--(*xp) < 0) { /* all done! */ + close(syncfd); + return(0); + } + } + sprintf(buf, "%d %d\n%d %d\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 */ + fcntl(syncfd, F_SETLKW, &fls); + return(1); + } + if (fgets(buf, sizeof(buf), stdin) == NULL) /* use stdin */ + return(0); + if (sscanf(buf, "%d %d", xp, yp) == 2) + return(1); + fprintf(stderr, "%s: input format error\n", progname); + exit(cleanup(1)); +} + + +int +cleanup(rstat) /* close rpict process and clean up */ +int rstat; +{ + int status; + + free((char *)pbuf); fclose(torp); fclose(fromrp); - rpstat = close_process(rpd); - if (rpstat == -1) - rpstat = 0; - return(rpstat); + while (wait(&status) != -1) + if (rstat == 0) + rstat = status>>8 & 0xff; + return(rstat); } rpiece() /* render picture piece by piece */ { - extern char *gets(), *strcat(); VIEW pview; - char buf[48]; int xorg, yorg; - - while (gets(buf) != NULL) { - if (sscanf(buf, "%d %d", &xorg, &yorg) != 2) { - fprintf(stderr, "%s: input format error\n", progname); - exit(1); - } - copystruct(&pview, &ourview); /* compute view for piece */ - switch (ourview.type) { - case VT_PER: - pview.horiz = 2.*180./PI*atan( - tan(PI/180./2.*ourview.horiz)/hmult ); - pview.vert = 2.*180./PI*atan( - tan(PI/180./2.*ourview.vert)/vmult ); - break; - case VT_PAR: - case VT_ANG: - pview.horiz = ourview.horiz / hmult; - pview.vert = ourview.vert / vmult; - break; - case VT_HEM: - default: - fprintf(stderr, "%s: unknown view type '-vt%c'\n", - progname, ourview.type); - exit(1); - } - pview.hoff += xorg - 0.5*(hmult-1); - pview.voff += yorg - 0.5*(vmult-1); + /* compute view parameters */ + copystruct(&pview, &ourview); + switch (ourview.type) { + case VT_PER: + pview.horiz = 2.*180./PI*atan( + tan(PI/180./2.*ourview.horiz)/hmult ); + pview.vert = 2.*180./PI*atan( + tan(PI/180./2.*ourview.vert)/vmult ); + break; + case VT_PAR: + case VT_ANG: + pview.horiz = ourview.horiz / hmult; + pview.vert = ourview.vert / vmult; + break; + case VT_HEM: + pview.horiz = 2.*180./PI*asin( + sin(PI/180./2.*ourview.horiz)/hmult ); + pview.vert = 2.*180./PI*asin( + sin(PI/180./2.*ourview.vert)/vmult ); + break; + default: + fprintf(stderr, "%s: unknown view type '-vt%c'\n", + progname, ourview.type); + exit(cleanup(1)); + } + /* render each piece */ + while (nextpiece(&xorg, &yorg)) { + pview.hoff = ourview.hoff + xorg - 0.5*(hmult-1); + pview.voff = ourview.voff + yorg - 0.5*(vmult-1); fputs(VIEWSTR, torp); fprintview(&pview, torp); putc('\n', torp); - fflush(torp); /* assign piece to rpict */ + fflush(torp); /* assigns piece to rpict */ putpiece(xorg, yorg); /* place piece in output */ if (verbose) { /* notify caller */ - strcat(buf, " done\n"); - writebuf(fileno(stdout), buf, strlen(buf)); + printf("%d %d done\n", xorg, yorg); + fflush(stdout); } } } +int putpiece(xpos, ypos) /* get next piece from rpict */ int xpos, ypos; { + struct flock fls; + int pid, status; int hr, vr; - int y; - - getheader(fromrp, NULL); /* discard header info. */ - if (fscnresolu(&hr, &vr, fromrp) < 0 || /* check resolution */ - hr != hres || vr != vres) { - fprintf(stderr, "%s: resolution mismatch from rpict\n", - progname); - exit(1); + register int y; + /* check bounds */ + if (xpos < 0 | ypos < 0 | xpos >= hmult | ypos >= vmult) { + fprintf(stderr, "%s: requested piece (%d,%d) out of range\n", + progname, xpos, ypos); + exit(cleanup(1)); } - for (y = 0; y < vr; y++) { /* transfer scanlines */ - if (freadcolrs(scanline, hr, fromrp) < 0) { - fprintf(stderr, "%s: read error from rpict\n", - progname); - exit(1); + /* check header from rpict */ + getheader(fromrp, NULL); + if (fscnresolu(&hr, &vr, fromrp) < 0 || hr != hres | vr != vres) { + fprintf(stderr, "%s: resolution mismatch from %s\n", + progname, rpargv[0]); + exit(cleanup(1)); + } + /* load new piece into buffer */ + for (y = 0; y < vr; y++) + if (freadcolrs(pbuf+y*hr, hr, fromrp) < 0) { + fprintf(stderr, "%s: read error from %s\n", + progname, rpargv[0]); + exit(cleanup(1)); } - if ((y == 0 || hmult != 1) && lseek(outfd, -scanorig+((long)((vmult-1-ypos)*vres+y)*hmult*hres+xpos*hres)*sizeof(COLR), - 0) == -1) { - fprintf(stderr, "%s: seek error\n", outfile); - exit(1); +#if MAXFORK + /* fork so we don't slow rpict down */ + if ((pid = fork()) > 0) { + if (++nforked >= MAXFORK) { + wait(&status); /* reap a child */ + if (status) + exit(cleanup(status>>8 & 0xff)); + nforked--; } - if (writebuf(outfd, (char *)scanline, hr*sizeof(COLR)) != - hr*sizeof(COLR)) { - fprintf(stderr, "%s: write error\n", outfile); - exit(1); + return(pid); + } +#else + pid = -1; /* no forking */ +#endif + /* lock file section so NFS doesn't mess up */ + fls.l_whence = 0; + fls.l_len = (long)vres*hmult*hres*sizeof(COLR); + fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len; + fls.l_type = F_WRLCK; + fcntl(outfd, F_SETLKW, &fls); + /* write new piece to file */ + if (lseek(outfd, fls.l_start+(long)xpos*hres*sizeof(COLR), 0) == -1) + goto seekerr; + if (hmult == 1) { + if (writebuf(outfd, (char *)pbuf, + vr*hr*sizeof(COLR)) != vr*hr*sizeof(COLR)) + goto writerr; + } else + for (y = 0; y < vr; y++) { + if (writebuf(outfd, (char *)(pbuf+y*hr), + hr*sizeof(COLR)) != hr*sizeof(COLR)) + goto writerr; + if (y < vr-1 && lseek(outfd, + (long)(hmult-1)*hr*sizeof(COLR), + 1) == -1) + goto seekerr; } + if (pid == -1) { /* fork failed */ + fls.l_type = F_UNLCK; /* release lock */ + fcntl(outfd, F_SETLKW, &fls); + return(0); } + _exit(0); /* else exit child process (releasing lock) */ +seekerr: + fprintf(stderr, "%s: seek error on file \"%s\"\n", progname, outfile); + _exit(1); +writerr: + fprintf(stderr, "%s: write error on file \"%s\"\n", progname, outfile); + _exit(1); }