110 |
|
|
111 |
|
char radname[PATH_MAX]; /* root Radiance file name */ |
112 |
|
|
113 |
+ |
#define inchild() (children_running < 0) |
114 |
|
|
115 |
+ |
|
116 |
|
main(argc, argv) |
117 |
|
int argc; |
118 |
|
char *argv[]; |
160 |
|
if (i >= argc) |
161 |
|
goto userr; |
162 |
|
rifname = argv[i]; |
163 |
+ |
/* check command-line options */ |
164 |
+ |
if (nprocs > 1 & viewselect != NULL) |
165 |
+ |
nprocs = 1; |
166 |
|
/* assign Radiance root file name */ |
167 |
|
rootname(radname, rifname); |
168 |
|
/* load variable values */ |
1042 |
|
} |
1043 |
|
|
1044 |
|
|
1045 |
< |
printview(vopts) /* print out selected view */ |
1045 |
> |
int |
1046 |
> |
myprintview(vopts, fp) /* print out selected view */ |
1047 |
|
register char *vopts; |
1048 |
+ |
FILE *fp; |
1049 |
|
{ |
1050 |
|
VIEW vwr; |
1051 |
|
char buf[128]; |
1066 |
|
viewfile(buf, &vwr, NULL); /* load -vf file */ |
1067 |
|
sscanview(&vwr, cp); /* reset tail */ |
1068 |
|
} |
1069 |
< |
fputs(VIEWSTR, stdout); |
1070 |
< |
fprintview(&vwr, stdout); /* print full spec. */ |
1071 |
< |
fputc('\n', stdout); |
1069 |
> |
fputs(VIEWSTR, fp); |
1070 |
> |
fprintview(&vwr, fp); /* print full spec. */ |
1071 |
> |
fputc('\n', fp); |
1072 |
|
return(0); |
1073 |
|
} |
1074 |
|
|
1082 |
|
if (touchonly || (vw = getview(0, NULL)) == NULL) |
1083 |
|
return; |
1084 |
|
if (sayview) |
1085 |
< |
printview(vw); |
1085 |
> |
myprintview(vw, stdout); |
1086 |
|
sprintf(combuf, "rview %s%s%s -R %s ", vw, po, opts, rifname); |
1087 |
|
if (rvdevice != NULL) |
1088 |
|
sprintf(combuf+strlen(combuf), "-o %s ", rvdevice); |
1102 |
|
char combuf[PATH_MAX]; |
1103 |
|
char rawfile[PATH_MAX], picfile[PATH_MAX]; |
1104 |
|
char zopt[PATH_MAX+4], rep[PATH_MAX+16], res[32]; |
1105 |
+ |
char rppopt[128], *pfile = NULL; |
1106 |
|
char pfopts[128]; |
1107 |
|
char vs[32], *vw; |
1108 |
|
int vn, mult; |
1109 |
+ |
FILE *fp; |
1110 |
|
time_t rfdt, pfdt; |
1111 |
|
/* get pfilt options */ |
1112 |
|
pfiltopts(pfopts); |
1148 |
|
else |
1149 |
|
badvalue(REPORT); |
1150 |
|
} |
1151 |
+ |
/* set up parallel rendering */ |
1152 |
+ |
if (nprocs > 1 & !vdef(ZFILE)) { |
1153 |
+ |
strcpy(rppopt, "-S 1 -PP pfXXXXXX"); |
1154 |
+ |
pfile = rppopt+9; |
1155 |
+ |
if (mktemp(pfile) == NULL) |
1156 |
+ |
pfile = NULL; |
1157 |
+ |
} |
1158 |
|
vn = 0; /* do each view */ |
1159 |
|
while ((vw = getview(vn++, vs)) != NULL) { |
1160 |
|
if (sayview) |
1161 |
< |
printview(vw); |
1161 |
> |
myprintview(vw, stdout); |
1162 |
|
if (!vs[0]) |
1163 |
|
sprintf(vs, "%d", vn); |
1164 |
|
sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs); |
1182 |
|
touch(picfile); |
1183 |
|
continue; |
1184 |
|
} |
1185 |
< |
if (next_process()) /* parallel running? */ |
1185 |
> |
if (next_process()) { /* parallel running? */ |
1186 |
> |
if (pfile != NULL) |
1187 |
> |
sleep(20); |
1188 |
|
continue; |
1189 |
+ |
} |
1190 |
|
/* XXX Remember to call finish_process() */ |
1191 |
|
/* build rpict command */ |
1192 |
< |
if (rfdt >= oct1date) /* recover */ |
1192 |
> |
if (rfdt >= oct1date) { /* recover */ |
1193 |
|
sprintf(combuf, "rpict%s%s%s%s -ro %s %s", |
1194 |
|
rep, po, opts, zopt, rawfile, oct1name); |
1195 |
< |
else { |
1195 |
> |
if (runcom(combuf)) /* run rpict */ |
1196 |
> |
goto rperror; |
1197 |
> |
} else { |
1198 |
|
if (overture) { /* run overture calculation */ |
1199 |
|
sprintf(combuf, |
1200 |
|
"rpict%s %s%s -x 64 -y 64 -ps 1 %s > %s", |
1211 |
|
#endif |
1212 |
|
} |
1213 |
|
sprintf(combuf, "rpict%s %s %s%s%s%s %s > %s", |
1214 |
< |
rep, vw, res, po, opts, zopt, |
1215 |
< |
oct1name, rawfile); |
1214 |
> |
rep, vw, res, po, opts, |
1215 |
> |
zopt, oct1name, rawfile); |
1216 |
> |
if (pfile != NULL && inchild()) { |
1217 |
> |
/* rpict persistent mode */ |
1218 |
> |
if (!silent) |
1219 |
> |
printf("\t%s\n", combuf); |
1220 |
> |
sprintf(combuf, "rpict%s %s %s%s%s %s > %s", |
1221 |
> |
rep, rppopt, res, po, opts, |
1222 |
> |
oct1name, rawfile); |
1223 |
> |
fflush(stdout); |
1224 |
> |
fp = popen(combuf, "w"); |
1225 |
> |
if (fp == NULL) |
1226 |
> |
goto rperror; |
1227 |
> |
myprintview(vw, fp); |
1228 |
> |
if (pclose(fp)) |
1229 |
> |
goto rperror; |
1230 |
> |
} else { /* rpict normal mode */ |
1231 |
> |
if (runcom(combuf)) |
1232 |
> |
goto rperror; |
1233 |
> |
} |
1234 |
|
} |
1196 |
– |
if (runcom(combuf)) { /* run rpict */ |
1197 |
– |
fprintf(stderr, "%s: error rendering view %s\n", |
1198 |
– |
progname, vs); |
1199 |
– |
quit(1); |
1200 |
– |
} |
1235 |
|
if (!vdef(RAWFILE) || strcmp(vval(RAWFILE),vval(PICTURE))) { |
1236 |
|
/* build pfilt command */ |
1237 |
|
if (mult > 1) |
1240 |
|
else |
1241 |
|
sprintf(combuf, "pfilt%s %s > %s", pfopts, |
1242 |
|
rawfile, picfile); |
1243 |
< |
if (runcom(combuf)) { /* run pfilt */ |
1243 |
> |
if (runcom(combuf)) { /* run pfilt */ |
1244 |
|
fprintf(stderr, |
1245 |
|
"%s: error filtering view %s\n\t%s removed\n", |
1246 |
|
progname, vs, picfile); |
1257 |
|
finish_process(); /* leave if child */ |
1258 |
|
} |
1259 |
|
wait_process(1); /* wait for children to finish */ |
1260 |
+ |
if (pfile != NULL) { /* clean up rpict persistent mode */ |
1261 |
+ |
int pid; |
1262 |
+ |
fp = fopen(pfile, "r"); |
1263 |
+ |
if (fp != NULL) { |
1264 |
+ |
if (fscanf(fp, "%*s %d", &pid) != 1 || |
1265 |
+ |
kill(pid, 1) == -1) |
1266 |
+ |
unlink(pfile); |
1267 |
+ |
fclose(fp); |
1268 |
+ |
} |
1269 |
+ |
} |
1270 |
+ |
return; |
1271 |
+ |
rperror: |
1272 |
+ |
fprintf(stderr, "%s: error rendering view %s\n", progname, vs); |
1273 |
+ |
quit(1); |
1274 |
|
} |
1275 |
|
|
1276 |
|
|
1340 |
|
|
1341 |
|
if (nprocs <= 1) |
1342 |
|
return(0); /* it's us or no one */ |
1343 |
< |
if (children_running < 0) { |
1343 |
> |
if (inchild()) { |
1344 |
|
fprintf(stderr, "%s: internal error 1 in spawn_process()\n", |
1345 |
|
progname); |
1346 |
|
quit(1); |
1403 |
|
|
1404 |
|
finish_process() /* exit a child process */ |
1405 |
|
{ |
1406 |
< |
if (children_running >= 0) |
1406 |
> |
if (!inchild()) |
1407 |
|
return; /* in parent -- noop */ |
1408 |
|
exit(0); |
1409 |
|
} |