21 |
|
#else |
22 |
|
#define REMSH "rsh" |
23 |
|
#endif |
24 |
< |
/* input variables */ |
25 |
< |
#define HOST 0 /* rendering host machine */ |
26 |
< |
#define RENDER 1 /* rendering options */ |
27 |
< |
#define PFILT 2 /* pfilt options */ |
28 |
< |
#define PINTERP 3 /* pinterp options */ |
29 |
< |
#define OCTREE 4 /* octree file name */ |
30 |
< |
#define DIRECTORY 5 /* working (sub)directory */ |
31 |
< |
#define BASENAME 6 /* output image base name */ |
32 |
< |
#define VIEWFILE 7 /* animation frame views */ |
33 |
< |
#define START 8 /* starting frame number */ |
34 |
< |
#define END 9 /* ending frame number */ |
35 |
< |
#define RIF 10 /* rad input file */ |
36 |
< |
#define NEXTANIM 11 /* next animation file */ |
37 |
< |
#define ANIMATE 12 /* animation command */ |
38 |
< |
#define TRANSFER 13 /* frame transfer command */ |
39 |
< |
#define ARCHIVE 14 /* archiving command */ |
40 |
< |
#define INTERP 15 /* # frames to interpolate */ |
41 |
< |
#define OVERSAMP 16 /* # times to oversample image */ |
42 |
< |
#define MBLUR 17 /* samples for motion blur */ |
43 |
< |
#define RTRACE 18 /* use rtrace with pinterp? */ |
44 |
< |
#define DISKSPACE 19 /* how much disk space to use */ |
45 |
< |
#define RESOLUTION 20 /* desired final resolution */ |
46 |
< |
#define EXPOSURE 21 /* how to compute exposure */ |
47 |
< |
#define RSH 22 /* remote shell script or program */ |
24 |
> |
/* input variables (alphabetical by name) */ |
25 |
> |
#define ANIMATE 0 /* animation command */ |
26 |
> |
#define ARCHIVE 1 /* archiving command */ |
27 |
> |
#define BASENAME 2 /* output image base name */ |
28 |
> |
#define DIRECTORY 3 /* working (sub)directory */ |
29 |
> |
#define DISKSPACE 4 /* how much disk space to use */ |
30 |
> |
#define END 5 /* ending frame number */ |
31 |
> |
#define EXPOSURE 6 /* how to compute exposure */ |
32 |
> |
#define HOST 7 /* rendering host machine */ |
33 |
> |
#define INTERP 8 /* # frames to interpolate */ |
34 |
> |
#define MBLUR 9 /* samples for motion blur */ |
35 |
> |
#define NEXTANIM 10 /* next animation file */ |
36 |
> |
#define OCTREE 11 /* octree file name */ |
37 |
> |
#define OVERSAMP 12 /* # times to oversample image */ |
38 |
> |
#define PFILT 13 /* pfilt options */ |
39 |
> |
#define PINTERP 14 /* pinterp options */ |
40 |
> |
#define RENDER 15 /* rendering options */ |
41 |
> |
#define RESOLUTION 16 /* desired final resolution */ |
42 |
> |
#define RIF 17 /* rad input file */ |
43 |
> |
#define RSH 18 /* remote shell script or program */ |
44 |
> |
#define RTRACE 19 /* use rtrace with pinterp? */ |
45 |
> |
#define START 20 /* starting frame number */ |
46 |
> |
#define TRANSFER 21 /* frame transfer command */ |
47 |
> |
#define VIEWFILE 22 /* animation frame views */ |
48 |
|
|
49 |
|
int NVARS = 23; /* total number of variables */ |
50 |
|
|
51 |
|
VARIABLE vv[] = { /* variable-value pairs */ |
52 |
– |
{"host", 4, 0, NULL, NULL}, |
53 |
– |
{"render", 3, 0, NULL, catvalues}, |
54 |
– |
{"pfilt", 2, 0, NULL, catvalues}, |
55 |
– |
{"pinterp", 2, 0, NULL, catvalues}, |
56 |
– |
{"OCTREE", 3, 0, NULL, onevalue}, |
57 |
– |
{"DIRECTORY", 3, 0, NULL, onevalue}, |
58 |
– |
{"BASENAME", 3, 0, NULL, onevalue}, |
59 |
– |
{"VIEWFILE", 2, 0, NULL, onevalue}, |
60 |
– |
{"START", 2, 0, NULL, intvalue}, |
61 |
– |
{"END", 2, 0, NULL, intvalue}, |
62 |
– |
{"RIF", 3, 0, NULL, onevalue}, |
63 |
– |
{"NEXTANIM", 3, 0, NULL, onevalue}, |
52 |
|
{"ANIMATE", 2, 0, NULL, onevalue}, |
65 |
– |
{"TRANSFER", 2, 0, NULL, onevalue}, |
53 |
|
{"ARCHIVE", 2, 0, NULL, onevalue}, |
54 |
+ |
{"BASENAME", 3, 0, NULL, onevalue}, |
55 |
+ |
{"DIRECTORY", 3, 0, NULL, onevalue}, |
56 |
+ |
{"DISKSPACE", 3, 0, NULL, fltvalue}, |
57 |
+ |
{"END", 2, 0, NULL, intvalue}, |
58 |
+ |
{"EXPOSURE", 3, 0, NULL, onevalue}, |
59 |
+ |
{"host", 4, 0, NULL, NULL}, |
60 |
|
{"INTERPOLATE", 3, 0, NULL, intvalue}, |
68 |
– |
{"OVERSAMPLE", 2, 0, NULL, fltvalue}, |
61 |
|
{"MBLUR", 2, 0, NULL, onevalue}, |
62 |
< |
{"RTRACE", 2, 0, NULL, boolvalue}, |
63 |
< |
{"DISKSPACE", 3, 0, NULL, fltvalue}, |
62 |
> |
{"NEXTANIM", 3, 0, NULL, onevalue}, |
63 |
> |
{"OCTREE", 3, 0, NULL, onevalue}, |
64 |
> |
{"OVERSAMPLE", 2, 0, NULL, fltvalue}, |
65 |
> |
{"pfilt", 2, 0, NULL, catvalues}, |
66 |
> |
{"pinterp", 2, 0, NULL, catvalues}, |
67 |
> |
{"render", 3, 0, NULL, catvalues}, |
68 |
|
{"RESOLUTION", 3, 0, NULL, onevalue}, |
69 |
< |
{"EXPOSURE", 3, 0, NULL, onevalue}, |
69 |
> |
{"RIF", 3, 0, NULL, onevalue}, |
70 |
|
{"RSH", 3, 0, NULL, onevalue}, |
71 |
+ |
{"RTRACE", 2, 0, NULL, boolvalue}, |
72 |
+ |
{"START", 2, 0, NULL, intvalue}, |
73 |
+ |
{"TRANSFER", 2, 0, NULL, onevalue}, |
74 |
+ |
{"VIEWFILE", 2, 0, NULL, onevalue}, |
75 |
|
}; |
76 |
|
|
77 |
|
#define SFNAME "STATUS" /* status file name */ |
93 |
|
int noaction = 0; /* take no action? */ |
94 |
|
|
95 |
|
char *remsh; /* remote shell program/script */ |
96 |
< |
char rendopt[2048] = ""; /* rendering options */ |
96 |
> |
char rendopt[2048]; /* rendering options */ |
97 |
|
char rresopt[32]; /* rendering resolution options */ |
98 |
|
char fresopt[32]; /* filter resolution options */ |
99 |
|
int pfiltalways; /* always use pfilt? */ |
108 |
|
} *pslot; /* process slots */ |
109 |
|
int npslots; /* number of process slots */ |
110 |
|
|
111 |
– |
int lastpid; /* ID of last completed background process */ |
112 |
– |
PSERVER *lastpserver; /* last process server used */ |
113 |
– |
|
111 |
|
#define phostname(ps) ((ps)->hostname[0] ? (ps)->hostname : astat.host) |
112 |
|
|
113 |
|
struct pslot *findpslot(); |
114 |
|
|
115 |
+ |
PSERVER *lastpserver; /* last process server with error */ |
116 |
+ |
|
117 |
|
VIEW *getview(); |
118 |
< |
char *getexp(); |
118 |
> |
char *getexp(), *dirfile(); |
119 |
|
|
120 |
|
extern time_t fdate(), time(); |
121 |
|
|
150 |
|
cfname = argv[i]; |
151 |
|
/* load variables */ |
152 |
|
loadvars(cfname); |
153 |
+ |
/* check variables */ |
154 |
+ |
checkvalues(); |
155 |
|
/* did we get DIRECTORY? */ |
156 |
|
checkdir(); |
157 |
|
/* check status */ |
232 |
|
} |
233 |
|
/* assume it is dead */ |
234 |
|
} |
235 |
< |
if (strcmp(cfname, astat.cfname) && astat.tnext != 0) { /* other's */ |
235 |
> |
if (strcmp(cfname, astat.cfname) && astat.pid != 0) { /* other's */ |
236 |
|
fprintf(stderr, "%s: unfinished job \"%s\"\n", |
237 |
|
progname, astat.cfname); |
238 |
|
return(-1); |
302 |
|
setdefaults() /* set default values */ |
303 |
|
{ |
304 |
|
extern char *atos(); |
305 |
+ |
int decades; |
306 |
|
char buf[256]; |
307 |
|
|
308 |
|
if (vdef(ANIMATE)) { |
336 |
|
quit(1); |
337 |
|
} |
338 |
|
if (!vdef(BASENAME)) { |
339 |
< |
sprintf(buf, "%s/frame%%03d", vval(DIRECTORY)); |
339 |
> |
decades = (int)log10((double)vint(END)) + 1; |
340 |
> |
if (decades < 3) decades = 3; |
341 |
> |
sprintf(buf, "%s/frame%%0%dd", vval(DIRECTORY), decades); |
342 |
|
vval(BASENAME) = savqstr(buf); |
343 |
|
vdef(BASENAME)++; |
344 |
|
} |
450 |
|
char combuf[256]; |
451 |
|
register int i; |
452 |
|
register char *cp; |
453 |
+ |
char *pippt; |
454 |
|
/* create rad command */ |
455 |
|
sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY)); |
456 |
|
sprintf(combuf, |
457 |
|
"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH", |
458 |
|
rfargs, rendopt+2); |
459 |
|
cp = combuf; |
460 |
< |
while (*cp) cp++; /* match unset variables */ |
460 |
> |
while (*cp) { |
461 |
> |
if (*cp == '|') pippt = cp; |
462 |
> |
cp++; |
463 |
> |
} /* match unset variables */ |
464 |
|
for (i = 0; mvar[i] >= 0; i++) |
465 |
|
if (!vdef(mvar[i])) { |
466 |
|
*cp++ = '|'; |
467 |
|
strcpy(cp, vnam(mvar[i])); |
468 |
|
while (*cp) cp++; |
469 |
+ |
pippt = NULL; |
470 |
|
} |
471 |
< |
sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); |
472 |
< |
cp += 11; /* point to file name */ |
471 |
> |
if (pippt != NULL) |
472 |
> |
strcpy(pippt, "> /dev/null"); /* nothing to match */ |
473 |
> |
else { |
474 |
> |
sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); |
475 |
> |
cp += 11; /* point to file name */ |
476 |
> |
} |
477 |
|
if (system(combuf)) { |
478 |
|
fprintf(stderr, "%s: error executing rad command:\n\t%s\n", |
479 |
|
progname, combuf); |
480 |
|
quit(1); |
481 |
|
} |
482 |
< |
loadvars(cp); /* load variables and remove file */ |
483 |
< |
unlink(cp); |
482 |
> |
if (pippt == NULL) { /* load variables and remove file */ |
483 |
> |
loadvars(cp); |
484 |
> |
unlink(cp); |
485 |
> |
} |
486 |
|
} |
487 |
|
|
488 |
|
|
497 |
|
i = sscanf(vval(RESOLUTION), "%d %d %f", &xres, &yres, &pa); |
498 |
|
mult = vflt(OVERSAMP); |
499 |
|
if (i == 3) { |
500 |
< |
sprintf(rresopt, "-x %d -y %d -pa %f", (int)(mult*xres), |
500 |
> |
sprintf(rresopt, "-x %d -y %d -pa %.3f", (int)(mult*xres), |
501 |
|
(int)(mult*yres), pa); |
502 |
< |
sprintf(fresopt, "-x %d -y %d -pa %f", xres, yres, pa); |
502 |
> |
sprintf(fresopt, "-x %d -y %d -pa %.3f", xres, yres, pa); |
503 |
|
} else if (i) { |
504 |
|
if (i == 1) yres = xres; |
505 |
|
sprintf(rresopt, "-x %d -y %d", (int)(mult*xres), |
536 |
|
quit(1); |
537 |
|
} |
538 |
|
/* initialize archive argument list */ |
539 |
< |
i = 16; |
525 |
< |
if (vdef(ARCHIVE) && strlen(vval(ARCHIVE)) > i) |
526 |
< |
i = strlen(vval(ARCHIVE)); |
539 |
> |
i = vdef(ARCHIVE) ? strlen(vval(ARCHIVE))+132 : 132; |
540 |
|
arcnext = arcfirst = arcargs + i; |
541 |
|
/* initialize status file */ |
542 |
|
if (astat.rnext == 0) |
640 |
|
|
641 |
|
transferframes() /* catch up with picture transfers */ |
642 |
|
{ |
643 |
< |
char combuf[10240]; |
643 |
> |
char combuf[10240], *fbase; |
644 |
|
register char *cp; |
645 |
|
register int i; |
646 |
|
|
651 |
|
putastat(); /* update status */ |
652 |
|
return; |
653 |
|
} |
654 |
< |
strcpy(combuf, vval(TRANSFER)); /* start transfer command */ |
655 |
< |
cp = combuf + strlen(combuf); |
654 |
> |
strcpy(combuf, "cd "); /* start transfer command */ |
655 |
> |
fbase = dirfile(cp = combuf+3, vval(BASENAME)); |
656 |
> |
if (*cp) { |
657 |
> |
while (*++cp) ; |
658 |
> |
*cp++ = ';'; *cp++ = ' '; |
659 |
> |
} else |
660 |
> |
cp = combuf; |
661 |
> |
strcpy(cp, vval(TRANSFER)); |
662 |
> |
while (*cp) cp++; |
663 |
|
/* make argument list */ |
664 |
|
for (i = astat.tnext; i < astat.fnext; i++) { |
665 |
|
*cp++ = ' '; |
666 |
< |
sprintf(cp, vval(BASENAME), i); |
666 |
> |
sprintf(cp, fbase, i); |
667 |
|
while (*cp) cp++; |
668 |
|
strcpy(cp, ".pic"); |
669 |
|
cp += 4; |
712 |
|
close(open(combuf, O_RDONLY|O_CREAT, 0666)); |
713 |
|
} |
714 |
|
/* create command */ |
715 |
< |
sprintf(combuf, "rpict%s -w0", rendopt); |
715 |
> |
sprintf(combuf, "rpict%s%s -w0", rendopt, |
716 |
> |
viewopt(getview(first>1 ? first-1 : 1))); |
717 |
|
if (vint(INTERP) || atoi(vval(MBLUR))) |
718 |
|
sprintf(combuf+strlen(combuf), " -z %s.zbf", vval(BASENAME)); |
719 |
|
sprintf(combuf+strlen(combuf), " -o %s.unf %s -S %d", |
805 |
|
{ |
806 |
|
#define RMCOML (sizeof(rmcom)-1) |
807 |
|
static char rmcom[] = "rm -f"; |
808 |
< |
register int i; |
808 |
> |
char basedir[128]; |
809 |
> |
int dlen, alen; |
810 |
> |
register int j; |
811 |
|
|
812 |
|
if (arcnext == arcfirst) |
813 |
|
return; /* nothing to do */ |
814 |
+ |
dirfile(basedir, vval(BASENAME)); |
815 |
+ |
dlen = strlen(basedir); |
816 |
|
if (vdef(ARCHIVE)) { /* run archive command */ |
817 |
< |
i = strlen(vval(ARCHIVE)); |
818 |
< |
strncpy(arcfirst-i, vval(ARCHIVE), i); |
819 |
< |
if (runcom(arcfirst-i)) { |
817 |
> |
alen = strlen(vval(ARCHIVE)); |
818 |
> |
if (dlen) { |
819 |
> |
j = alen + dlen + 5; |
820 |
> |
strncpy(arcfirst-j, "cd ", 3); |
821 |
> |
strncpy(arcfirst-j+3, basedir, dlen); |
822 |
> |
(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' '; |
823 |
> |
} else |
824 |
> |
j = alen; |
825 |
> |
strncpy(arcfirst-alen, vval(ARCHIVE), alen); |
826 |
> |
if (runcom(arcfirst-j)) { |
827 |
|
fprintf(stderr, "%s: error running archive command\n", |
828 |
|
progname); |
829 |
|
quit(1); |
830 |
|
} |
831 |
|
} |
832 |
+ |
if (dlen) { |
833 |
+ |
j = RMCOML + dlen + 5; |
834 |
+ |
strncpy(arcfirst-j, "cd ", 3); |
835 |
+ |
strncpy(arcfirst-j+3, basedir, dlen); |
836 |
+ |
(arcfirst-j)[dlen+3] = ';'; (arcfirst-j)[dlen+4] = ' '; |
837 |
+ |
} else |
838 |
+ |
j = RMCOML; |
839 |
|
/* run remove command */ |
840 |
|
strncpy(arcfirst-RMCOML, rmcom, RMCOML); |
841 |
< |
runcom(arcfirst-RMCOML); |
841 |
> |
runcom(arcfirst-j); |
842 |
|
arcnext = arcfirst; /* reset argument list */ |
843 |
|
#undef RMCOML |
844 |
|
} |
853 |
|
{ |
854 |
|
extern int frecover(); |
855 |
|
static int iter = 0; |
856 |
< |
char fnbefore[128], fnafter[128]; |
856 |
> |
char fnbefore[128], fnafter[128], *fbase; |
857 |
|
char combuf[1024], fname0[128], fname1[128]; |
858 |
|
int usepinterp, usepfilt, nora_rgbe; |
859 |
|
int frseq[2]; |
867 |
|
/* compute rendered views */ |
868 |
|
frseq[0] = frame - ((frame-1) % (vint(INTERP)+1)); |
869 |
|
frseq[1] = frseq[0] + vint(INTERP) + 1; |
870 |
+ |
fbase = dirfile(NULL, vval(BASENAME)); |
871 |
|
if (frseq[1] > vint(END)) |
872 |
|
frseq[1] = vint(END); |
873 |
|
if (frseq[1] == frame) { /* pfilt only */ |
877 |
|
} else if (frseq[0] == frame) { /* no interpolation needed */ |
878 |
|
if (!rvr && frame > 1+vint(INTERP)) { /* archive previous */ |
879 |
|
*arcnext++ = ' '; |
880 |
< |
sprintf(arcnext, vval(BASENAME), frame-vint(INTERP)-1); |
880 |
> |
sprintf(arcnext, fbase, frame-vint(INTERP)-1); |
881 |
|
while (*arcnext) arcnext++; |
882 |
|
strcpy(arcnext, ".unf"); |
883 |
|
arcnext += 4; |
884 |
|
if (usepinterp || vint(INTERP)) { /* and Z-buf */ |
885 |
|
*arcnext++ = ' '; |
886 |
< |
sprintf(arcnext, vval(BASENAME), |
847 |
< |
frame-vint(INTERP)-1); |
886 |
> |
sprintf(arcnext, fbase, frame-vint(INTERP)-1); |
887 |
|
while (*arcnext) arcnext++; |
888 |
|
strcpy(arcnext, ".zbf"); |
889 |
|
arcnext += 4; |
904 |
|
if (rvr == 2 && recover(frseq[1])) /* recover after? */ |
905 |
|
return(1); |
906 |
|
if (atoi(vval(MBLUR))) { |
868 |
– |
FILE *fp; /* motion blurring */ |
907 |
|
sprintf(fname0, "%s/vw0%c", vval(DIRECTORY), |
908 |
|
'a'+(iter%26)); |
871 |
– |
if ((fp = fopen(fname0, "w")) == NULL) { |
872 |
– |
perror(fname0); quit(1); |
873 |
– |
} |
874 |
– |
fputs(VIEWSTR, fp); |
875 |
– |
fprintview(vp, fp); |
876 |
– |
putc('\n', fp); fclose(fp); |
877 |
– |
if ((vp = getview(frame+1)) == NULL) { |
878 |
– |
fprintf(stderr, |
879 |
– |
"%s: unexpected error reading view for frame %d\n", |
880 |
– |
progname, frame+1); |
881 |
– |
quit(1); |
882 |
– |
} |
909 |
|
sprintf(fname1, "%s/vw1%c", vval(DIRECTORY), |
910 |
|
'a'+(iter%26)); |
911 |
< |
if ((fp = fopen(fname1, "w")) == NULL) { |
912 |
< |
perror(fname1); quit(1); |
911 |
> |
if (!noaction) { |
912 |
> |
FILE *fp; /* motion blurring */ |
913 |
> |
if ((fp = fopen(fname0, "w")) == NULL) { |
914 |
> |
perror(fname0); quit(1); |
915 |
> |
} |
916 |
> |
fputs(VIEWSTR, fp); |
917 |
> |
fprintview(vp, fp); |
918 |
> |
putc('\n', fp); fclose(fp); |
919 |
> |
if ((vp = getview(frame+1)) == NULL) { |
920 |
> |
fprintf(stderr, |
921 |
> |
"%s: unexpected error reading view for frame %d\n", |
922 |
> |
progname, frame+1); |
923 |
> |
quit(1); |
924 |
> |
} |
925 |
> |
if ((fp = fopen(fname1, "w")) == NULL) { |
926 |
> |
perror(fname1); quit(1); |
927 |
> |
} |
928 |
> |
fputs(VIEWSTR, fp); |
929 |
> |
fprintview(vp, fp); |
930 |
> |
putc('\n', fp); fclose(fp); |
931 |
|
} |
888 |
– |
fputs(VIEWSTR, fp); |
889 |
– |
fprintview(vp, fp); |
890 |
– |
putc('\n', fp); fclose(fp); |
932 |
|
sprintf(combuf, |
933 |
|
"(pmblur %s %d %s %s; rm -f %s %s) | pinterp -B", |
934 |
|
*sskip(vval(MBLUR)) ? sskip2(vval(MBLUR),1) : "1", |
940 |
|
strcat(combuf, viewopt(vp)); |
941 |
|
if (vbool(RTRACE)) |
942 |
|
sprintf(combuf+strlen(combuf), " -ff -fr '%s -w0 %s'", |
943 |
< |
rendopt, vval(OCTREE)); |
943 |
> |
rendopt+1, vval(OCTREE)); |
944 |
|
if (vdef(PINTERP)) |
945 |
|
sprintf(combuf+strlen(combuf), " %s", vval(PINTERP)); |
946 |
|
if (usepfilt) |
1011 |
|
} |
1012 |
|
return(NULL); |
1013 |
|
} |
1014 |
< |
if (viewfp == NULL) { /* open file */ |
1014 |
> |
if (viewfp == NULL) { /* open file */ |
1015 |
|
if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) { |
1016 |
|
perror(vval(VIEWFILE)); |
1017 |
|
quit(1); |
1018 |
|
} |
1019 |
< |
} else if (n < viewnum) { /* rewind file */ |
1019 |
> |
} else if (n > 0 && n < viewnum) { /* rewind file */ |
1020 |
|
if (viewnum == 1 && feof(viewfp)) |
1021 |
|
return(&curview); /* just one view */ |
1022 |
|
if (fseek(viewfp, 0L, 0) == EOF) { |
1026 |
|
copystruct(&curview, &stdview); |
1027 |
|
viewnum = 0; |
1028 |
|
} |
1029 |
+ |
if (n < 0) { /* get next view */ |
1030 |
+ |
register int c = getc(viewfp); |
1031 |
+ |
if (c == EOF) |
1032 |
+ |
return((VIEW *)NULL); /* that's it */ |
1033 |
+ |
ungetc(c, viewfp); |
1034 |
+ |
n = viewnum + 1; |
1035 |
+ |
} |
1036 |
|
while (n > viewnum) { /* scan to desired view */ |
1037 |
|
if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL) |
1038 |
< |
return(viewnum==1 ? &curview : NULL); |
1038 |
> |
return(viewnum==1 ? &curview : (VIEW *)NULL); |
1039 |
|
if (isview(linebuf) && sscanview(&curview, linebuf) > 0) |
1040 |
|
viewnum++; |
1041 |
|
} |
1046 |
|
int |
1047 |
|
countviews() /* count views in view file */ |
1048 |
|
{ |
1049 |
< |
register int n = 0; |
1049 |
> |
int n; |
1050 |
|
|
1051 |
< |
while (getview(n+1) != NULL) |
1051 |
> |
if (getview(n=1) == NULL) |
1052 |
> |
return(0); |
1053 |
> |
while (getview(-1) != NULL) |
1054 |
|
n++; |
1055 |
|
return(n); |
1056 |
|
} |
1151 |
|
int status; |
1152 |
|
{ |
1153 |
|
register PROC *pp; |
1154 |
+ |
register struct pslot *psl; |
1155 |
|
|
1156 |
|
pp = ps->proc + pn; |
1157 |
|
if (pp->elen) { /* pass errors */ |
1163 |
|
if (ps->hostname[0]) |
1164 |
|
status = 1; /* because rsh doesn't return status */ |
1165 |
|
} |
1166 |
+ |
lastpserver = NULL; |
1167 |
+ |
psl = findpslot(pp->pid); /* check for bruncom() slot */ |
1168 |
+ |
if (psl->pid) { |
1169 |
+ |
if (status) { |
1170 |
+ |
if (psl->rcvf != NULL) /* attempt recovery */ |
1171 |
+ |
status = (*psl->rcvf)(psl->fout); |
1172 |
+ |
if (status) { |
1173 |
+ |
fprintf(stderr, |
1174 |
+ |
"%s: error rendering frame %d\n", |
1175 |
+ |
progname, psl->fout); |
1176 |
+ |
quit(1); |
1177 |
+ |
} |
1178 |
+ |
lastpserver = ps; |
1179 |
+ |
} |
1180 |
+ |
psl->pid = 0; /* free process slot */ |
1181 |
+ |
} else if (status) |
1182 |
+ |
lastpserver = ps; |
1183 |
|
freestr(pp->com); /* free command string */ |
1116 |
– |
lastpid = pp->pid; /* record PID for bwait() */ |
1117 |
– |
lastpserver = ps; /* record server for serverdown() */ |
1184 |
|
return(status); |
1185 |
|
} |
1186 |
|
|
1188 |
|
int |
1189 |
|
serverdown() /* check status of last process server */ |
1190 |
|
{ |
1191 |
+ |
if (lastpserver == NULL || !lastpserver->hostname[0]) |
1192 |
+ |
return(0); |
1193 |
|
if (pserverOK(lastpserver)) /* server still up? */ |
1194 |
|
return(0); |
1195 |
|
delpserver(lastpserver); /* else delete it */ |
1216 |
|
printf("\t%s\n", com); /* echo command */ |
1217 |
|
return(0); |
1218 |
|
} |
1219 |
< |
/* else start it when we can */ |
1220 |
< |
while ((pid = startjob(NULL, savestr(com), donecom)) == -1) |
1219 |
> |
com = savestr(com); /* else start it when we can */ |
1220 |
> |
while ((pid = startjob(NULL, com, donecom)) == -1) |
1221 |
|
bwait(1); |
1222 |
|
if (!silent) { /* echo command */ |
1223 |
|
PSERVER *ps; |
1239 |
|
int ncoms; |
1240 |
|
{ |
1241 |
|
int status; |
1174 |
– |
register struct pslot *psl; |
1242 |
|
|
1243 |
|
if (noaction) |
1244 |
|
return; |
1245 |
|
while ((status = wait4job(NULL, -1)) != -1) { |
1246 |
< |
psl = findpslot(lastpid); |
1247 |
< |
if (status) { /* attempt recovery */ |
1248 |
< |
serverdown(); /* check server */ |
1182 |
< |
if (psl->rcvf == NULL || (*psl->rcvf)(psl->fout)) { |
1183 |
< |
fprintf(stderr, |
1184 |
< |
"%s: error rendering frame %d\n", |
1185 |
< |
progname, psl->fout); |
1186 |
< |
quit(1); |
1187 |
< |
} |
1188 |
< |
} |
1189 |
< |
psl->pid = 0; /* free process slot */ |
1190 |
< |
if (!--ncoms) |
1191 |
< |
return; /* done enough */ |
1246 |
> |
serverdown(); /* update server status */ |
1247 |
> |
if (--ncoms == 0) |
1248 |
> |
break; /* done enough */ |
1249 |
|
} |
1250 |
|
} |
1251 |
|
|
1257 |
|
{ |
1258 |
|
int retstatus = 0; |
1259 |
|
int hostcopies; |
1260 |
< |
char com1buf[10240], *com1, *endcom1; |
1260 |
> |
char buf[10240], *com1, *s; |
1261 |
|
int status; |
1262 |
+ |
int pfd; |
1263 |
+ |
register int n; |
1264 |
|
register PSERVER *ps; |
1265 |
|
|
1266 |
|
if (!silent) |
1272 |
|
for (ps = pslist; ps != NULL; ps = ps->next) { |
1273 |
|
hostcopies = 0; |
1274 |
|
if (maxcopies > 1 && ps->nprocs > 1 && ppins != NULL) { |
1275 |
< |
strcpy(com1=com1buf, com); /* build -PP command */ |
1275 |
> |
strcpy(com1=buf, com); /* build -PP command */ |
1276 |
|
sprintf(com1+(ppins-com), " -PP %s/%s.persist", |
1277 |
|
vval(DIRECTORY), phostname(ps)); |
1278 |
|
strcat(com1, ppins); |
1279 |
< |
endcom1 = com1 + strlen(com1); |
1221 |
< |
sprintf(endcom1, "; kill `sed -n '1s/^[^ ]* //p' %s/%s.persist`", |
1222 |
< |
vval(DIRECTORY), phostname(ps)); |
1223 |
< |
} else { |
1279 |
> |
} else |
1280 |
|
com1 = com; |
1281 |
< |
endcom1 = NULL; |
1281 |
> |
while (maxcopies > 0) { |
1282 |
> |
s = savestr(com1); |
1283 |
> |
if (startjob(ps, s, donecom) != -1) { |
1284 |
> |
sleep(20); |
1285 |
> |
hostcopies++; |
1286 |
> |
maxcopies--; |
1287 |
> |
} else { |
1288 |
> |
freestr(s); |
1289 |
> |
break; |
1290 |
> |
} |
1291 |
|
} |
1227 |
– |
while (maxcopies > 0 && |
1228 |
– |
startjob(ps, savestr(com1), donecom) != -1) { |
1229 |
– |
sleep(10); |
1230 |
– |
hostcopies++; |
1231 |
– |
maxcopies--; |
1232 |
– |
if (endcom1 != NULL) |
1233 |
– |
*endcom1 = '\0'; |
1234 |
– |
} |
1292 |
|
if (!silent && hostcopies) { |
1293 |
|
if (hostcopies > 1) |
1294 |
|
printf("\t%d duplicate processes", hostcopies); |
1300 |
|
} |
1301 |
|
/* wait for jobs to finish */ |
1302 |
|
while ((status = wait4job(NULL, -1)) != -1) |
1303 |
< |
if (status) |
1304 |
< |
retstatus += !serverdown(); /* check server */ |
1303 |
> |
retstatus += status && !serverdown(); |
1304 |
> |
/* terminate parallel rpict's */ |
1305 |
> |
for (ps = pslist; ps != NULL; ps = ps->next) { |
1306 |
> |
sprintf(buf, "%s/%s.persist", vval(DIRECTORY), phostname(ps)); |
1307 |
> |
if ((pfd = open(buf, O_RDONLY)) >= 0) { |
1308 |
> |
n = read(pfd, buf, sizeof(buf)-1); /* get PID */ |
1309 |
> |
buf[n] = '\0'; |
1310 |
> |
close(pfd); |
1311 |
> |
for (n = 0; buf[n] && !isspace(buf[n]); n++) |
1312 |
> |
; |
1313 |
> |
/* terminate */ |
1314 |
> |
sprintf(buf, "kill -ALRM %d", atoi(buf+n)); |
1315 |
> |
wait4job(ps, startjob(ps, buf, NULL)); |
1316 |
> |
} |
1317 |
> |
} |
1318 |
|
return(retstatus); |
1319 |
|
} |
1320 |
|
|
1352 |
|
fprintf(stderr, "%s: bad value for variable '%s'\n", |
1353 |
|
progname, vnam(vc)); |
1354 |
|
quit(1); |
1355 |
+ |
} |
1356 |
+ |
|
1357 |
+ |
|
1358 |
+ |
char * |
1359 |
+ |
dirfile(df, path) /* separate path into directory and file */ |
1360 |
+ |
char *df; |
1361 |
+ |
register char *path; |
1362 |
+ |
{ |
1363 |
+ |
register int i; |
1364 |
+ |
int psep; |
1365 |
+ |
|
1366 |
+ |
for (i = 0, psep = -1; path[i]; i++) |
1367 |
+ |
if (path[i] == '/') |
1368 |
+ |
psep = i; |
1369 |
+ |
if (df != NULL) |
1370 |
+ |
if (psep == 0) { |
1371 |
+ |
df[0] = '/'; |
1372 |
+ |
df[1] = '\0'; |
1373 |
+ |
} else if (psep > 0) { |
1374 |
+ |
strncpy(df, path, psep); |
1375 |
+ |
df[psep] = '\0'; |
1376 |
+ |
} else |
1377 |
+ |
df[0] = '\0'; |
1378 |
+ |
return(path+psep+1); |
1379 |
|
} |