25 |
|
typedef double DCOLOR[3]; /* double-precision color */ |
26 |
|
|
27 |
|
/* |
28 |
< |
* The modcont structure is used to accumulate ray contributions |
28 |
> |
* The MODCONT structure is used to accumulate ray contributions |
29 |
|
* for a particular modifier, which may be subdivided into bins |
30 |
< |
* if binv is non-NULL. If outspec contains a %s in it, this will |
30 |
> |
* if binv evaluates > 0. If outspec contains a %s in it, this will |
31 |
|
* be replaced with the modifier name. If outspec contains a %d in it, |
32 |
|
* this will be used to create one output file per bin, otherwise all bins |
33 |
|
* will be written to the same file, in order. If the global outfmt |
46 |
|
|
47 |
|
LUTAB modconttab = LU_SINIT(NULL,mcfree); /* modifier lookup table */ |
48 |
|
|
49 |
< |
/* close output stream */ |
50 |
< |
static void closefile(void *p) { fclose((FILE *)p); } |
49 |
> |
/* |
50 |
> |
* The STREAMOUT structure holds an open FILE pointer and a count of |
51 |
> |
* the number of RGB triplets per record, or 0 if unknown. |
52 |
> |
*/ |
53 |
> |
typedef struct { |
54 |
> |
FILE *ofp; /* output file pointer */ |
55 |
> |
int outpipe; /* output is to a pipe */ |
56 |
> |
int reclen; /* triplets/record */ |
57 |
> |
int xr, yr; /* output resolution for picture */ |
58 |
> |
} STREAMOUT; |
59 |
|
|
60 |
< |
LUTAB ofiletab = LU_SINIT(free,closefile); /* output file table */ |
60 |
> |
/* close output stream and free record */ |
61 |
> |
static void |
62 |
> |
closestream(void *p) |
63 |
> |
{ |
64 |
> |
STREAMOUT *sop = (STREAMOUT *)p; |
65 |
> |
int status; |
66 |
> |
if (sop->outpipe) |
67 |
> |
status = pclose(sop->ofp); |
68 |
> |
else |
69 |
> |
status = fclose(sop->ofp); |
70 |
> |
if (status) |
71 |
> |
error(SYSTEM, "error closing output stream"); |
72 |
> |
free(p); |
73 |
> |
} |
74 |
|
|
75 |
+ |
LUTAB ofiletab = LU_SINIT(free,closestream); /* output file table */ |
76 |
+ |
|
77 |
|
#define OF_MODIFIER 01 |
78 |
|
#define OF_BIN 02 |
79 |
|
|
80 |
< |
FILE *getofile(const char *ospec, const char *mname, int bn); |
80 |
> |
STREAMOUT *getostream(const char *ospec, const char *mname, int bn, int noopen); |
81 |
|
int ofname(char *oname, const char *ospec, const char *mname, int bn); |
82 |
|
void printheader(FILE *fout, const char *info); |
83 |
+ |
void printresolu(FILE *fout, int xr, int yr); |
84 |
|
|
85 |
|
/* |
86 |
|
* The rcont structure is used to manage i/o with a particular |
99 |
|
|
100 |
|
/* rtrace command and defaults */ |
101 |
|
char *rtargv[256+2*MAXMODLIST] = { "rtrace", |
102 |
< |
"-dj", ".5", "-dr", "3", |
103 |
< |
"-ab", "1", "-ad", "128", }; |
102 |
> |
"-dj", ".9", "-dr", "3", |
103 |
> |
"-ab", "1", "-ad", "350", }; |
104 |
> |
|
105 |
|
int rtargc = 9; |
106 |
|
/* overriding rtrace options */ |
107 |
< |
char *myrtopts[] = { "-o~~TmWdp", "-h-", "-x", "1", "-y", "0", |
107 |
> |
char *myrtopts[] = { "-h-", "-x", "1", "-y", "0", |
108 |
|
"-dt", "0", "-as", "0", "-aa", "0", NULL }; |
109 |
|
|
110 |
+ |
#define RTCOEFF "-o~~TmWdp" /* compute coefficients only */ |
111 |
+ |
#define RTCONTRIB "-o~~TmVdp" /* compute ray contributions */ |
112 |
+ |
|
113 |
|
struct rtproc rt0; /* head of rtrace process list */ |
114 |
|
|
115 |
|
struct rtproc *rt_unproc = NULL; /* unprocessed ray trees */ |
116 |
|
|
117 |
< |
char persistfn[] = "pfXXXXXX"; /* persist file name */ |
117 |
> |
#define PERSIST_NONE 0 /* no persist file */ |
118 |
> |
#define PERSIST_SINGLE 1 /* user set -P persist */ |
119 |
> |
#define PERSIST_PARALL 2 /* user set -PP persist */ |
120 |
> |
#define PERSIST_OURS 3 /* -PP persist belongs to us */ |
121 |
> |
int persist_state = PERSIST_NONE; /* persist file state */ |
122 |
> |
char persistfn[] = "pfXXXXXX"; /* our persist file name, if set */ |
123 |
|
|
124 |
|
int gargc; /* global argc */ |
125 |
|
char **gargv; /* global argv */ |
131 |
|
int outfmt = 'a'; /* output format */ |
132 |
|
|
133 |
|
int header = 1; /* output header? */ |
134 |
+ |
int force_open = 0; /* truncate existing output? */ |
135 |
+ |
int recover = 0; /* recover previous output? */ |
136 |
+ |
int accumulate = 1; /* input rays per output record */ |
137 |
|
int xres = 0; /* horiz. output resolution */ |
138 |
|
int yres = 0; /* vert. output resolution */ |
139 |
|
|
140 |
+ |
int account; /* current accumulation count */ |
141 |
|
unsigned long raysleft; /* number of rays left to trace */ |
142 |
|
long waitflush; /* how long until next flush */ |
143 |
|
|
149 |
|
const char *modname[MAXMODLIST]; /* ordered modifier name list */ |
150 |
|
int nmods = 0; /* number of modifiers */ |
151 |
|
|
152 |
< |
MODCONT *addmodifier(char *modn, char *outf, char *binv); |
116 |
< |
void addmodfile(char *fname, char *outf, char *binv); |
152 |
> |
#define queue_length() (lastray - lastdone) |
153 |
|
|
154 |
+ |
MODCONT *growmodifier(MODCONT *mp, int nb); |
155 |
+ |
MODCONT *addmodifier(char *modn, char *outf, char *binv, int bincnt); |
156 |
+ |
void addmodfile(char *fname, char *outf, char *binv, int bincnt); |
157 |
+ |
|
158 |
|
void init(int np); |
159 |
|
int done_rprocs(struct rtproc *rtp); |
160 |
+ |
void reload_output(void); |
161 |
|
void recover_output(FILE *fin); |
162 |
|
void trace_contribs(FILE *fin); |
163 |
|
struct rtproc *wait_rproc(void); |
167 |
|
|
168 |
|
void put_contrib(const DCOLOR cnt, FILE *fout); |
169 |
|
void add_contrib(const char *modn); |
170 |
< |
void done_contrib(void); |
170 |
> |
void done_contrib(int navg); |
171 |
|
|
172 |
+ |
/* return number of open rtrace processes */ |
173 |
+ |
static int |
174 |
+ |
nrtprocs(void) |
175 |
+ |
{ |
176 |
+ |
int nrtp = 0; |
177 |
+ |
struct rtproc *rtp; |
178 |
+ |
|
179 |
+ |
for (rtp = &rt0; rtp != NULL; rtp = rtp->next) |
180 |
+ |
nrtp += rtp->pd.running; |
181 |
+ |
return(nrtp); |
182 |
+ |
} |
183 |
+ |
|
184 |
|
/* set input/output format */ |
185 |
|
static void |
186 |
|
setformat(const char *fmt) |
220 |
|
int |
221 |
|
main(int argc, char *argv[]) |
222 |
|
{ |
223 |
+ |
int contrib = 0; |
224 |
|
int nprocs = 1; |
171 |
– |
int recover = 0; |
225 |
|
char *curout = NULL; |
226 |
|
char *binval = NULL; |
227 |
+ |
int bincnt = 0; |
228 |
|
char fmt[8]; |
229 |
|
int i, j; |
230 |
|
/* need at least one argument */ |
231 |
|
if (argc < 2) { |
232 |
|
fprintf(stderr, |
233 |
< |
"Usage: %s [-n nprocs][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n", |
233 |
> |
"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n", |
234 |
|
argv[0]); |
235 |
|
exit(1); |
236 |
|
} |
246 |
|
while ((j = expandarg(&argc, &argv, i)) > 0) |
247 |
|
; |
248 |
|
if (j < 0) { |
249 |
< |
fprintf(stderr, "%s: cannot expand '%s'", |
249 |
> |
fprintf(stderr, "%s: cannot expand '%s'\n", |
250 |
|
argv[0], argv[i]); |
251 |
|
exit(1); |
252 |
|
} |
253 |
|
if (argv[i][0] == '-') |
254 |
|
switch (argv[i][1]) { |
201 |
– |
case 'r': /* recover output */ |
202 |
– |
if (argv[i][2]) break; |
203 |
– |
recover++; |
204 |
– |
continue; |
255 |
|
case 'n': /* number of processes */ |
256 |
|
if (argv[i][2] || i >= argc-2) break; |
257 |
|
nprocs = atoi(argv[++i]); |
258 |
|
if (nprocs <= 0) |
259 |
|
error(USER, "illegal number of processes"); |
260 |
|
continue; |
261 |
+ |
case 'V': /* output contributions */ |
262 |
+ |
switch (argv[i][2]) { |
263 |
+ |
case '\0': |
264 |
+ |
contrib = !contrib; |
265 |
+ |
continue; |
266 |
+ |
case '+': case '1': |
267 |
+ |
case 'T': case 't': |
268 |
+ |
case 'Y': case 'y': |
269 |
+ |
contrib = 1; |
270 |
+ |
continue; |
271 |
+ |
case '-': case '0': |
272 |
+ |
case 'F': case 'f': |
273 |
+ |
case 'N': case 'n': |
274 |
+ |
contrib = 0; |
275 |
+ |
continue; |
276 |
+ |
} |
277 |
+ |
break; |
278 |
+ |
case 'c': /* input rays per output */ |
279 |
+ |
if (argv[i][2] || i >= argc-2) break; |
280 |
+ |
accumulate = atoi(argv[++i]); |
281 |
+ |
continue; |
282 |
+ |
case 'r': /* recover output */ |
283 |
+ |
if (argv[i][2]) break; |
284 |
+ |
recover = 1; |
285 |
+ |
continue; |
286 |
|
case 'h': /* output header? */ |
287 |
|
switch (argv[i][2]) { |
288 |
|
case '\0': |
300 |
|
continue; |
301 |
|
} |
302 |
|
break; |
303 |
< |
case 'f': /* file or i/o format */ |
303 |
> |
case 'f': /* file or force or format */ |
304 |
|
if (!argv[i][2]) { |
305 |
|
char *fpath; |
306 |
|
if (i >= argc-2) break; |
315 |
|
fcompile(fpath); |
316 |
|
continue; |
317 |
|
} |
318 |
+ |
if (argv[i][2] == 'o') { |
319 |
+ |
force_open = 1; |
320 |
+ |
continue; |
321 |
+ |
} |
322 |
|
setformat(argv[i]+2); |
323 |
|
continue; |
324 |
|
case 'e': /* expression */ |
337 |
|
if (argv[i][2] || i >= argc-2) break; |
338 |
|
yres = atoi(argv[++i]); |
339 |
|
continue; |
340 |
< |
case 'b': /* bin expression */ |
341 |
< |
if (argv[i][2] || i >= argc-2) break; |
340 |
> |
case 'b': /* bin expression/count */ |
341 |
> |
if (i >= argc-2) break; |
342 |
> |
if (argv[i][2] == 'n') { |
343 |
> |
bincnt = atoi(argv[++i]); |
344 |
> |
continue; |
345 |
> |
} |
346 |
> |
if (argv[i][2]) break; |
347 |
|
binval = argv[++i]; |
348 |
|
continue; |
349 |
|
case 'm': /* modifier name */ |
350 |
|
if (argv[i][2] || i >= argc-2) break; |
351 |
|
rtargv[rtargc++] = "-ti"; |
352 |
|
rtargv[rtargc++] = argv[++i]; |
353 |
< |
addmodifier(argv[i], curout, binval); |
353 |
> |
addmodifier(argv[i], curout, binval, bincnt); |
354 |
|
continue; |
355 |
|
case 'M': /* modifier file */ |
356 |
|
if (argv[i][2] || i >= argc-2) break; |
357 |
|
rtargv[rtargc++] = "-tI"; |
358 |
|
rtargv[rtargc++] = argv[++i]; |
359 |
< |
addmodfile(argv[i], curout, binval); |
359 |
> |
addmodfile(argv[i], curout, binval, bincnt); |
360 |
|
continue; |
361 |
+ |
case 'P': /* persist file */ |
362 |
+ |
if (i >= argc-2) break; |
363 |
+ |
persist_state = (argv[i][2] == 'P') ? |
364 |
+ |
PERSIST_PARALL : PERSIST_SINGLE; |
365 |
+ |
rtargv[rtargc++] = argv[i]; |
366 |
+ |
rtargv[rtargc++] = argv[++i]; |
367 |
+ |
continue; |
368 |
|
} |
369 |
|
rtargv[rtargc++] = argv[i]; /* assume rtrace option */ |
370 |
|
} |
371 |
+ |
if (accumulate <= 0) /* no output flushing for single record */ |
372 |
+ |
xres = yres = 0; |
373 |
|
/* set global argument list */ |
374 |
|
gargc = argc; gargv = argv; |
375 |
|
/* add "mandatory" rtrace settings */ |
376 |
|
for (j = 0; myrtopts[j] != NULL; j++) |
377 |
|
rtargv[rtargc++] = myrtopts[j]; |
378 |
+ |
rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF; |
379 |
|
/* just asking for defaults? */ |
380 |
|
if (!strcmp(argv[i], "-defaults")) { |
381 |
|
char sxres[16], syres[16]; |
382 |
|
char *rtpath; |
383 |
< |
printf("-n %-2d\t\t\t\t# number of processes\n", nprocs); |
383 |
> |
printf("-n %-2d\t\t\t\t# number of processes\n", nprocs); |
384 |
> |
printf("-c %-5d\t\t\t# accumulated rays per record\n", |
385 |
> |
accumulate); |
386 |
> |
printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-', |
387 |
> |
contrib ? "contributions" : "coefficients"); |
388 |
|
fflush(stdout); /* report OUR options */ |
389 |
|
rtargv[rtargc++] = header ? "-h+" : "-h-"; |
390 |
|
sprintf(fmt, "-f%c%c", inpfmt, outfmt); |
395 |
|
rtargv[rtargc++] = "-y"; |
396 |
|
sprintf(syres, "%d", yres); |
397 |
|
rtargv[rtargc++] = syres; |
300 |
– |
rtargv[rtargc++] = "-oTW"; |
398 |
|
rtargv[rtargc++] = "-defaults"; |
399 |
|
rtargv[rtargc] = NULL; |
400 |
|
rtpath = getpath(rtargv[0], getenv("PATH"), X_OK); |
408 |
|
exit(1); |
409 |
|
} |
410 |
|
if (nprocs > 1) { /* add persist file if parallel */ |
411 |
< |
rtargv[rtargc++] = "-PP"; |
412 |
< |
rtargv[rtargc++] = mktemp(persistfn); |
411 |
> |
if (persist_state == PERSIST_SINGLE) |
412 |
> |
error(USER, "use -PP option for multiple processes"); |
413 |
> |
if (persist_state == PERSIST_NONE) { |
414 |
> |
rtargv[rtargc++] = "-PP"; |
415 |
> |
rtargv[rtargc++] = mktemp(persistfn); |
416 |
> |
persist_state = PERSIST_OURS; |
417 |
> |
} |
418 |
|
} |
419 |
|
/* add format string */ |
420 |
|
sprintf(fmt, "-f%cf", inpfmt); |
424 |
|
error(USER, "missing octree argument"); |
425 |
|
rtargv[rtargc++] = octree = argv[i]; |
426 |
|
rtargv[rtargc] = NULL; |
427 |
< |
/* start rtrace */ |
427 |
> |
/* start rtrace & recover if requested */ |
428 |
|
init(nprocs); |
429 |
< |
if (recover) /* perform recovery if requested */ |
430 |
< |
recover_output(stdin); |
431 |
< |
trace_contribs(stdin); /* compute contributions */ |
429 |
> |
/* compute contributions */ |
430 |
> |
trace_contribs(stdin); |
431 |
> |
/* clean up */ |
432 |
|
quit(0); |
433 |
|
} |
434 |
|
|
474 |
|
{ |
475 |
|
int rtstat; |
476 |
|
|
477 |
< |
if (rt0.next != NULL) /* terminate persistent rtrace */ |
477 |
> |
if (persist_state == PERSIST_OURS) /* terminate waiting rtrace */ |
478 |
|
killpersist(); |
479 |
|
/* clean up rtrace process(es) */ |
480 |
|
rtstat = done_rprocs(&rt0); |
541 |
|
raysleft = yres; |
542 |
|
} else |
543 |
|
raysleft = 0; |
544 |
+ |
if ((account = accumulate) > 0) |
545 |
+ |
raysleft *= accumulate; |
546 |
|
waitflush = xres; |
547 |
+ |
if (!recover) |
548 |
+ |
return; |
549 |
+ |
/* recover previous values */ |
550 |
+ |
if (accumulate <= 0) |
551 |
+ |
reload_output(); |
552 |
+ |
else |
553 |
+ |
recover_output(stdin); |
554 |
|
} |
555 |
|
|
556 |
+ |
/* grow modifier to accommodate more bins */ |
557 |
+ |
MODCONT * |
558 |
+ |
growmodifier(MODCONT *mp, int nb) |
559 |
+ |
{ |
560 |
+ |
if (nb <= mp->nbins) |
561 |
+ |
return mp; |
562 |
+ |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + sizeof(DCOLOR)*(nb-1)); |
563 |
+ |
if (mp == NULL) |
564 |
+ |
error(SYSTEM, "out of memory in growmodifier"); |
565 |
+ |
memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(nb-mp->nbins)); |
566 |
+ |
mp->nbins = nb; |
567 |
+ |
return mp; |
568 |
+ |
} |
569 |
+ |
|
570 |
|
/* add modifier to our list to track */ |
571 |
|
MODCONT * |
572 |
< |
addmodifier(char *modn, char *outf, char *binv) |
572 |
> |
addmodifier(char *modn, char *outf, char *binv, int bincnt) |
573 |
|
{ |
574 |
|
LUENT *lep = lu_find(&modconttab, modn); |
575 |
|
MODCONT *mp; |
576 |
+ |
int i; |
577 |
|
|
578 |
|
if (lep->data != NULL) { |
579 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
586 |
|
mp = (MODCONT *)malloc(sizeof(MODCONT)); |
587 |
|
if (mp == NULL) |
588 |
|
error(SYSTEM, "out of memory in addmodifier"); |
463 |
– |
lep->data = (char *)mp; |
589 |
|
mp->outspec = outf; /* XXX assumes static string */ |
590 |
|
mp->modname = modn; /* XXX assumes static string */ |
591 |
|
if (binv != NULL) |
594 |
|
mp->binv = eparse("0"); |
595 |
|
mp->nbins = 1; |
596 |
|
setcolor(mp->cbin[0], 0., 0., 0.); |
597 |
+ |
if (mp->binv->type == NUM) /* assume one bin if constant */ |
598 |
+ |
bincnt = 1; |
599 |
+ |
else if (bincnt > 1) |
600 |
+ |
mp = growmodifier(mp, bincnt); |
601 |
+ |
lep->data = (char *)mp; |
602 |
+ |
/* allocate output streams */ |
603 |
+ |
for (i = bincnt; i-- > 0; ) |
604 |
+ |
getostream(mp->outspec, mp->modname, i, 1); |
605 |
|
return mp; |
606 |
|
} |
607 |
|
|
608 |
|
/* add modifiers from a file list */ |
609 |
|
void |
610 |
< |
addmodfile(char *fname, char *outf, char *binv) |
610 |
> |
addmodfile(char *fname, char *outf, char *binv, int bincnt) |
611 |
|
{ |
612 |
|
char *mname[MAXMODLIST]; |
613 |
|
int i; |
617 |
|
error(SYSTEM, errmsg); |
618 |
|
} |
619 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
620 |
< |
addmodifier(mname[i], outf, binv); |
620 |
> |
addmodifier(mname[i], outf, binv, bincnt); |
621 |
|
} |
622 |
|
|
623 |
|
/* put string to stderr */ |
717 |
|
break; |
718 |
|
} |
719 |
|
fputc('\n', fout); |
720 |
< |
if (xres > 0) { |
721 |
< |
if (yres > 0) /* resolution string */ |
722 |
< |
fprtresolu(xres, yres, fout); |
720 |
> |
} |
721 |
> |
|
722 |
> |
/* write resolution string to given output stream */ |
723 |
> |
void |
724 |
> |
printresolu(FILE *fout, int xr, int yr) |
725 |
> |
{ |
726 |
> |
if ((xr > 0) & (yr > 0)) /* resolution string */ |
727 |
> |
fprtresolu(xr, yr, fout); |
728 |
> |
if (xres > 0) /* global flush flag */ |
729 |
|
fflush(fout); |
591 |
– |
} |
730 |
|
} |
731 |
|
|
732 |
< |
/* Get output file pointer (open and write header if new) */ |
733 |
< |
FILE * |
734 |
< |
getofile(const char *ospec, const char *mname, int bn) |
732 |
> |
/* Get output stream pointer (open and write header if new and noopen==0) */ |
733 |
> |
STREAMOUT * |
734 |
> |
getostream(const char *ospec, const char *mname, int bn, int noopen) |
735 |
|
{ |
736 |
< |
int ofl; |
737 |
< |
char oname[1024]; |
738 |
< |
LUENT *lep; |
736 |
> |
static const DCOLOR nocontrib = BLKCOLOR; |
737 |
> |
static STREAMOUT stdos; |
738 |
> |
int ofl; |
739 |
> |
char oname[1024]; |
740 |
> |
LUENT *lep; |
741 |
> |
STREAMOUT *sop; |
742 |
|
|
743 |
|
if (ospec == NULL) { /* use stdout? */ |
744 |
< |
if (!using_stdout) { |
744 |
> |
if (!noopen && !using_stdout) { |
745 |
|
if (outfmt != 'a') |
746 |
|
SET_FILE_BINARY(stdout); |
747 |
|
if (header) |
748 |
|
printheader(stdout, NULL); |
749 |
+ |
printresolu(stdout, xres, yres); |
750 |
+ |
stdos.xr = xres; stdos.yr = yres; |
751 |
+ |
using_stdout = 1; |
752 |
|
} |
753 |
< |
using_stdout = 1; |
754 |
< |
return stdout; |
753 |
> |
stdos.ofp = stdout; |
754 |
> |
stdos.reclen += noopen; |
755 |
> |
return &stdos; |
756 |
|
} |
757 |
|
ofl = ofname(oname, ospec, mname, bn); /* get output name */ |
758 |
|
if (ofl < 0) { |
762 |
|
lep = lu_find(&ofiletab, oname); /* look it up */ |
763 |
|
if (lep->key == NULL) /* new entry */ |
764 |
|
lep->key = strcpy((char *)malloc(strlen(oname)+1), oname); |
765 |
< |
if (lep->data == NULL) { /* open output file */ |
766 |
< |
FILE *fp; |
767 |
< |
int i; |
768 |
< |
if (oname[0] == '!') /* output to command */ |
769 |
< |
fp = popen(oname+1, "w"); |
770 |
< |
else |
771 |
< |
fp = fopen(oname, "w"); |
772 |
< |
if (fp == NULL) { |
773 |
< |
sprintf(errmsg, "cannot open '%s' for writing", oname); |
774 |
< |
error(SYSTEM, errmsg); |
765 |
> |
sop = (STREAMOUT *)lep->data; |
766 |
> |
if (sop == NULL) { /* allocate stream */ |
767 |
> |
sop = (STREAMOUT *)malloc(sizeof(STREAMOUT)); |
768 |
> |
if (sop == NULL) |
769 |
> |
error(SYSTEM, "out of memory in getostream"); |
770 |
> |
sop->outpipe = oname[0] == '!'; |
771 |
> |
sop->reclen = 0; |
772 |
> |
sop->ofp = NULL; /* open iff noopen==0 */ |
773 |
> |
sop->xr = xres; sop->yr = yres; |
774 |
> |
lep->data = (char *)sop; |
775 |
> |
if (!sop->outpipe & !force_open & !recover && |
776 |
> |
access(oname, F_OK) == 0) { |
777 |
> |
errno = EEXIST; /* file exists */ |
778 |
> |
goto openerr; |
779 |
|
} |
780 |
+ |
} |
781 |
+ |
if (!noopen && sop->ofp == NULL) { /* open output stream */ |
782 |
+ |
long i; |
783 |
+ |
if (oname[0] == '!') /* output to command */ |
784 |
+ |
sop->ofp = popen(oname+1, "w"); |
785 |
+ |
else /* else open file */ |
786 |
+ |
sop->ofp = fopen(oname, "w"); |
787 |
+ |
if (sop->ofp == NULL) |
788 |
+ |
goto openerr; |
789 |
|
if (outfmt != 'a') |
790 |
< |
SET_FILE_BINARY(fp); |
790 |
> |
SET_FILE_BINARY(sop->ofp); |
791 |
|
if (header) { |
792 |
|
char info[512]; |
793 |
|
char *cp = info; |
794 |
< |
sprintf(cp, "MODIFIER=%s\n", mname); |
795 |
< |
while (*cp) ++cp; |
794 |
> |
if (ofl & OF_MODIFIER || sop->reclen == 1) { |
795 |
> |
sprintf(cp, "MODIFIER=%s\n", mname); |
796 |
> |
while (*cp) ++cp; |
797 |
> |
} |
798 |
|
if (ofl & OF_BIN) { |
799 |
|
sprintf(cp, "BIN=%d\n", bn); |
800 |
|
while (*cp) ++cp; |
801 |
|
} |
802 |
|
*cp = '\0'; |
803 |
< |
printheader(fp, info); |
803 |
> |
printheader(sop->ofp, info); |
804 |
|
} |
805 |
+ |
if (accumulate > 0) { /* global resolution */ |
806 |
+ |
sop->xr = xres; sop->yr = yres; |
807 |
+ |
} |
808 |
+ |
printresolu(sop->ofp, sop->xr, sop->yr); |
809 |
|
/* play catch-up */ |
810 |
< |
for (i = 0; i < lastdone; i++) { |
811 |
< |
static const DCOLOR nocontrib = BLKCOLOR; |
812 |
< |
put_contrib(nocontrib, fp); |
810 |
> |
for (i = accumulate > 0 ? lastdone/accumulate : 0; i--; ) { |
811 |
> |
int j = sop->reclen; |
812 |
> |
if (j <= 0) j = 1; |
813 |
> |
while (j--) |
814 |
> |
put_contrib(nocontrib, sop->ofp); |
815 |
|
if (outfmt == 'a') |
816 |
< |
putc('\n', fp); |
816 |
> |
putc('\n', sop->ofp); |
817 |
|
} |
818 |
|
if (xres > 0) |
819 |
< |
fflush(fp); |
654 |
< |
lep->data = (char *)fp; |
819 |
> |
fflush(sop->ofp); |
820 |
|
} |
821 |
< |
return (FILE *)lep->data; /* return open file pointer */ |
821 |
> |
sop->reclen += noopen; /* add to length if noopen */ |
822 |
> |
return sop; /* return output stream */ |
823 |
> |
openerr: |
824 |
> |
sprintf(errmsg, "cannot open '%s' for writing", oname); |
825 |
> |
error(SYSTEM, errmsg); |
826 |
> |
return NULL; /* pro forma return */ |
827 |
|
} |
828 |
|
|
829 |
|
/* read input ray into buffer */ |
830 |
|
int |
831 |
|
getinp(char *buf, FILE *fp) |
832 |
|
{ |
833 |
+ |
double dv[3], *dvp; |
834 |
+ |
float *fvp; |
835 |
|
char *cp; |
836 |
|
int i; |
837 |
|
|
840 |
|
cp = buf; /* make sure we get 6 floats */ |
841 |
|
for (i = 0; i < 6; i++) { |
842 |
|
if (fgetword(cp, buf+127-cp, fp) == NULL) |
843 |
< |
return 0; |
843 |
> |
return -1; |
844 |
> |
if (i >= 3) |
845 |
> |
dv[i-3] = atof(cp); |
846 |
|
if ((cp = fskip(cp)) == NULL || *cp) |
847 |
< |
return 0; |
847 |
> |
return -1; |
848 |
|
*cp++ = ' '; |
849 |
|
} |
850 |
|
getc(fp); /* get/put eol */ |
851 |
|
*cp-- = '\0'; *cp = '\n'; |
852 |
+ |
if (DOT(dv,dv) <= FTINY*FTINY) |
853 |
+ |
return 0; /* dummy ray */ |
854 |
|
return strlen(buf); |
855 |
|
case 'f': |
856 |
|
if (fread(buf, sizeof(float), 6, fp) < 6) |
857 |
< |
return 0; |
857 |
> |
return -1; |
858 |
> |
fvp = (float *)buf + 3; |
859 |
> |
if (DOT(fvp,fvp) <= FTINY*FTINY) |
860 |
> |
return 0; /* dummy ray */ |
861 |
|
return sizeof(float)*6; |
862 |
|
case 'd': |
863 |
|
if (fread(buf, sizeof(double), 6, fp) < 6) |
864 |
< |
return 0; |
864 |
> |
return -1; |
865 |
> |
dvp = (double *)buf + 3; |
866 |
> |
if (DOT(dvp,dvp) <= FTINY*FTINY) |
867 |
> |
return 0; /* dummy ray */ |
868 |
|
return sizeof(double)*6; |
869 |
|
} |
870 |
|
error(INTERNAL, "botched input format"); |
871 |
< |
return 0; /* pro forma return */ |
871 |
> |
return -1; /* pro forma return */ |
872 |
|
} |
873 |
|
|
874 |
|
static float rparams[9]; /* traced ray parameters */ |
898 |
|
bn = (int)(evalue(mp->binv) + .5); |
899 |
|
if (bn <= 0) |
900 |
|
bn = 0; |
901 |
< |
else if (bn >= mp->nbins) { /* new bin */ |
902 |
< |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + |
721 |
< |
bn*sizeof(DCOLOR)); |
722 |
< |
if (mp == NULL) |
723 |
< |
error(SYSTEM, "out of memory in add_contrib"); |
724 |
< |
memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(bn+1-mp->nbins)); |
725 |
< |
mp->nbins = bn+1; |
726 |
< |
le->data = (char *)mp; |
727 |
< |
} |
901 |
> |
else if (bn >= mp->nbins) /* new bin */ |
902 |
> |
le->data = (char *)(mp = growmodifier(mp, bn+1)); |
903 |
|
addcolor(mp->cbin[bn], rparams); |
904 |
|
} |
905 |
|
|
907 |
|
static int |
908 |
|
puteol(const LUENT *e, void *p) |
909 |
|
{ |
910 |
< |
FILE *fp = (FILE *)e->data; |
910 |
> |
STREAMOUT *sop = (STREAMOUT *)e->data; |
911 |
|
|
912 |
|
if (outfmt == 'a') |
913 |
< |
putc('\n', fp); |
913 |
> |
putc('\n', sop->ofp); |
914 |
|
if (!waitflush) |
915 |
< |
fflush(fp); |
916 |
< |
if (ferror(fp)) { |
915 |
> |
fflush(sop->ofp); |
916 |
> |
if (ferror(sop->ofp)) { |
917 |
|
sprintf(errmsg, "write error on file '%s'", e->key); |
918 |
|
error(SYSTEM, errmsg); |
919 |
|
} |
932 |
|
fprintf(fout, "%.6e\t%.6e\t%.6e\t", cnt[0], cnt[1], cnt[2]); |
933 |
|
break; |
934 |
|
case 'f': |
935 |
< |
fv[0] = cnt[0]; |
761 |
< |
fv[1] = cnt[1]; |
762 |
< |
fv[2] = cnt[2]; |
935 |
> |
copycolor(fv, cnt); |
936 |
|
fwrite(fv, sizeof(float), 3, fout); |
937 |
|
break; |
938 |
|
case 'd': |
947 |
|
} |
948 |
|
} |
949 |
|
|
950 |
< |
/* output ray tallies and clear for next primary */ |
950 |
> |
/* output ray tallies and clear for next accumulation */ |
951 |
|
void |
952 |
< |
done_contrib(void) |
952 |
> |
done_contrib(int navg) |
953 |
|
{ |
954 |
< |
int i, j; |
955 |
< |
MODCONT *mp; |
956 |
< |
FILE *fp; |
954 |
> |
double sf = 1.; |
955 |
> |
int i, j; |
956 |
> |
MODCONT *mp; |
957 |
> |
STREAMOUT *sop; |
958 |
> |
/* set average scaling */ |
959 |
> |
if (navg > 1) |
960 |
> |
sf = 1. / (double)navg; |
961 |
|
/* output modifiers in order */ |
962 |
|
for (i = 0; i < nmods; i++) { |
963 |
|
mp = (MODCONT *)lu_find(&modconttab,modname[i])->data; |
964 |
< |
fp = getofile(mp->outspec, mp->modname, 0); |
965 |
< |
put_contrib(mp->cbin[0], fp); |
964 |
> |
if (navg > 1) /* average scaling */ |
965 |
> |
for (j = mp->nbins; j--; ) |
966 |
> |
scalecolor(mp->cbin[j], sf); |
967 |
> |
sop = getostream(mp->outspec, mp->modname, 0,0); |
968 |
> |
put_contrib(mp->cbin[0], sop->ofp); |
969 |
|
if (mp->nbins > 3 && /* minor optimization */ |
970 |
< |
fp == getofile(mp->outspec, mp->modname, 1)) |
970 |
> |
sop == getostream(mp->outspec, mp->modname, 1,0)) |
971 |
|
for (j = 1; j < mp->nbins; j++) |
972 |
< |
put_contrib(mp->cbin[j], fp); |
972 |
> |
put_contrib(mp->cbin[j], sop->ofp); |
973 |
|
else |
974 |
|
for (j = 1; j < mp->nbins; j++) |
975 |
|
put_contrib(mp->cbin[j], |
976 |
< |
getofile(mp->outspec, mp->modname, j)); |
977 |
< |
/* clear for next ray tree */ |
976 |
> |
getostream(mp->outspec,mp->modname,j,0)->ofp); |
977 |
> |
/* clear for next time */ |
978 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |
979 |
|
} |
980 |
|
--waitflush; /* terminate records */ |
1033 |
|
if (!n || !(isalpha(*cp) | (*cp == '_'))) |
1034 |
|
error(USER, "bad modifier name from rtrace"); |
1035 |
|
/* get modifier name */ |
1036 |
< |
while (n > 0 && *cp != '\t') { |
1036 |
> |
while (n > 1 && *cp != '\t') { |
1037 |
> |
if (mnp - modname >= sizeof(modname)-2) |
1038 |
> |
error(INTERNAL, "modifier name too long"); |
1039 |
|
*mnp++ = *cp++; n--; |
1040 |
|
} |
1041 |
|
*mnp = '\0'; |
1047 |
|
cp += sizeof(float)*9; n -= sizeof(float)*9; |
1048 |
|
add_contrib(modname); |
1049 |
|
} |
1050 |
< |
done_contrib(); /* sum up contributions & output */ |
1050 |
> |
/* time to produce record? */ |
1051 |
> |
if (account > 0 && !--account) |
1052 |
> |
done_contrib(account = accumulate); |
1053 |
|
lastdone = rtp->raynum; |
1054 |
< |
free(rtp->buf); /* free up buffer space */ |
1054 |
> |
if (rtp->buf != NULL) /* free up buffer space */ |
1055 |
> |
free(rtp->buf); |
1056 |
|
rt_unproc = rtp->next; |
1057 |
|
free(rtp); /* done with this ray tree */ |
1058 |
|
} |
1100 |
|
if (rt->bsiz + BUFSIZ <= treebufsiz) |
1101 |
|
rt->bsiz = treebufsiz; |
1102 |
|
else |
1103 |
< |
rt->bsiz = treebufsiz += BUFSIZ; |
1103 |
> |
treebufsiz = rt->bsiz += BUFSIZ; |
1104 |
|
rt->buf = (char *)realloc(rt->buf, rt->bsiz); |
1105 |
|
} |
1106 |
|
if (rt->buf == NULL) |
1136 |
|
void |
1137 |
|
trace_contribs(FILE *fin) |
1138 |
|
{ |
1139 |
+ |
static int ignore_warning_given = 0; |
1140 |
|
char inpbuf[128]; |
1141 |
|
int iblen; |
1142 |
|
struct rtproc *rtp; |
1143 |
|
/* loop over input */ |
1144 |
< |
while ((iblen = getinp(inpbuf, fin)) > 0) { |
1145 |
< |
if (lastray+1 < lastray) { /* counter rollover? */ |
1144 |
> |
while ((iblen = getinp(inpbuf, fin)) >= 0) { |
1145 |
> |
if (!iblen && accumulate != 1) { |
1146 |
> |
if (!ignore_warning_given++) |
1147 |
> |
error(WARNING, |
1148 |
> |
"dummy ray(s) ignored during accumulation\n"); |
1149 |
> |
continue; |
1150 |
> |
} |
1151 |
> |
if (!iblen || /* need reset? */ |
1152 |
> |
queue_length() > 10*nrtprocs() || |
1153 |
> |
lastray+1 < lastray) { |
1154 |
|
while (wait_rproc() != NULL) |
1155 |
|
process_queue(); |
1156 |
< |
lastdone = lastray = 0; |
1156 |
> |
if (lastray+1 < lastray) |
1157 |
> |
lastdone = lastray = 0; |
1158 |
|
} |
1159 |
|
rtp = get_rproc(); /* get avail. rtrace process */ |
1160 |
< |
rtp->raynum = ++lastray; /* assign ray to it */ |
1161 |
< |
writebuf(rtp->pd.w, inpbuf, iblen); |
1162 |
< |
if (raysleft && !--raysleft) |
1163 |
< |
break; |
1160 |
> |
rtp->raynum = ++lastray; /* assign ray */ |
1161 |
> |
if (iblen) { /* trace ray if valid */ |
1162 |
> |
writebuf(rtp->pd.w, inpbuf, iblen); |
1163 |
> |
} else { /* else bypass dummy ray */ |
1164 |
> |
queue_raytree(rtp); /* empty tree */ |
1165 |
> |
if ((yres <= 0) | (waitflush > 1)) |
1166 |
> |
waitflush = 1; /* flush after this */ |
1167 |
> |
} |
1168 |
|
process_queue(); /* catch up with results */ |
1169 |
+ |
if (raysleft && !--raysleft) |
1170 |
+ |
break; /* preemptive EOI */ |
1171 |
|
} |
1172 |
|
while (wait_rproc() != NULL) /* process outstanding rays */ |
1173 |
|
process_queue(); |
1174 |
+ |
if (accumulate <= 0) |
1175 |
+ |
done_contrib(0); /* output tallies */ |
1176 |
+ |
else if (account < accumulate) { |
1177 |
+ |
error(WARNING, "partial accumulation in final record"); |
1178 |
+ |
done_contrib(accumulate - account); |
1179 |
+ |
} |
1180 |
|
if (raysleft) |
1181 |
|
error(USER, "unexpected EOF on input"); |
1182 |
|
lu_done(&ofiletab); /* close output files */ |
1183 |
|
} |
1184 |
|
|
1185 |
+ |
/* get ray contribution from previous file */ |
1186 |
+ |
static int |
1187 |
+ |
get_contrib(DCOLOR cnt, FILE *finp) |
1188 |
+ |
{ |
1189 |
+ |
COLOR fv; |
1190 |
+ |
COLR cv; |
1191 |
+ |
|
1192 |
+ |
switch (outfmt) { |
1193 |
+ |
case 'a': |
1194 |
+ |
return(fscanf(finp,"%lf %lf %lf",&cnt[0],&cnt[1],&cnt[2]) == 3); |
1195 |
+ |
case 'f': |
1196 |
+ |
if (fread(fv, sizeof(fv[0]), 3, finp) != 3) |
1197 |
+ |
return(0); |
1198 |
+ |
copycolor(cnt, fv); |
1199 |
+ |
return(1); |
1200 |
+ |
case 'd': |
1201 |
+ |
return(fread(cnt, sizeof(cnt[0]), 3, finp) == 3); |
1202 |
+ |
case 'c': |
1203 |
+ |
if (fread(cv, sizeof(cv), 1, finp) != 1) |
1204 |
+ |
return(0); |
1205 |
+ |
colr_color(fv, cv); |
1206 |
+ |
copycolor(cnt, fv); |
1207 |
+ |
return(1); |
1208 |
+ |
default: |
1209 |
+ |
error(INTERNAL, "botched output format"); |
1210 |
+ |
} |
1211 |
+ |
return(0); /* pro forma return */ |
1212 |
+ |
} |
1213 |
+ |
|
1214 |
+ |
/* close output file opened for input */ |
1215 |
+ |
static int |
1216 |
+ |
myclose(const LUENT *e, void *p) |
1217 |
+ |
{ |
1218 |
+ |
STREAMOUT *sop = (STREAMOUT *)e->data; |
1219 |
+ |
|
1220 |
+ |
if (sop->ofp == NULL) |
1221 |
+ |
return(0); |
1222 |
+ |
fclose(sop->ofp); |
1223 |
+ |
sop->ofp = NULL; |
1224 |
+ |
return(0); |
1225 |
+ |
} |
1226 |
+ |
|
1227 |
+ |
/* load previously accumulated values */ |
1228 |
+ |
void |
1229 |
+ |
reload_output(void) |
1230 |
+ |
{ |
1231 |
+ |
int i, j; |
1232 |
+ |
MODCONT *mp; |
1233 |
+ |
int ofl; |
1234 |
+ |
char oname[1024]; |
1235 |
+ |
char *fmode = "rb"; |
1236 |
+ |
char *outvfmt; |
1237 |
+ |
LUENT *ment, *oent; |
1238 |
+ |
int xr, yr; |
1239 |
+ |
STREAMOUT sout; |
1240 |
+ |
DCOLOR rgbv; |
1241 |
+ |
|
1242 |
+ |
switch (outfmt) { |
1243 |
+ |
case 'a': |
1244 |
+ |
outvfmt = "ascii"; |
1245 |
+ |
fmode = "r"; |
1246 |
+ |
break; |
1247 |
+ |
case 'f': |
1248 |
+ |
outvfmt = "float"; |
1249 |
+ |
break; |
1250 |
+ |
case 'd': |
1251 |
+ |
outvfmt = "double"; |
1252 |
+ |
break; |
1253 |
+ |
case 'c': |
1254 |
+ |
outvfmt = COLRFMT; |
1255 |
+ |
break; |
1256 |
+ |
default: |
1257 |
+ |
error(INTERNAL, "botched output format"); |
1258 |
+ |
return; |
1259 |
+ |
} |
1260 |
+ |
/* reload modifier values */ |
1261 |
+ |
for (i = 0; i < nmods; i++) { |
1262 |
+ |
ment = lu_find(&modconttab,modname[i]); |
1263 |
+ |
mp = (MODCONT *)ment->data; |
1264 |
+ |
if (mp->outspec == NULL) |
1265 |
+ |
error(USER, "cannot reload from stdout"); |
1266 |
+ |
if (mp->outspec[0] == '!') |
1267 |
+ |
error(USER, "cannot reload from command"); |
1268 |
+ |
for (j = 0; ; j++) { /* load each modifier bin */ |
1269 |
+ |
ofl = ofname(oname, mp->outspec, mp->modname, j); |
1270 |
+ |
if (ofl < 0) |
1271 |
+ |
error(USER, "bad output file specification"); |
1272 |
+ |
oent = lu_find(&ofiletab, oname); |
1273 |
+ |
if (oent->data != NULL) { |
1274 |
+ |
sout = *(STREAMOUT *)oent->data; |
1275 |
+ |
} else { |
1276 |
+ |
sout.reclen = 0; |
1277 |
+ |
sout.outpipe = 0; |
1278 |
+ |
sout.xr = xres; sout.yr = yres; |
1279 |
+ |
sout.ofp = NULL; |
1280 |
+ |
} |
1281 |
+ |
if (sout.ofp == NULL) { /* open output as input */ |
1282 |
+ |
sout.ofp = fopen(oname, fmode); |
1283 |
+ |
if (sout.ofp == NULL) { |
1284 |
+ |
if (j) |
1285 |
+ |
break; /* assume end of modifier */ |
1286 |
+ |
sprintf(errmsg, "missing reload file '%s'", |
1287 |
+ |
oname); |
1288 |
+ |
error(WARNING, errmsg); |
1289 |
+ |
break; |
1290 |
+ |
} |
1291 |
+ |
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
1292 |
+ |
sprintf(errmsg, "format mismatch for '%s'", |
1293 |
+ |
oname); |
1294 |
+ |
error(USER, errmsg); |
1295 |
+ |
} |
1296 |
+ |
if ((sout.xr > 0) & (sout.yr > 0) && |
1297 |
+ |
(!fscnresolu(&xr, &yr, sout.ofp) || |
1298 |
+ |
(xr != sout.xr) | |
1299 |
+ |
(yr != sout.yr))) { |
1300 |
+ |
sprintf(errmsg, "resolution mismatch for '%s'", |
1301 |
+ |
oname); |
1302 |
+ |
error(USER, errmsg); |
1303 |
+ |
} |
1304 |
+ |
} |
1305 |
+ |
/* read in RGB value */ |
1306 |
+ |
if (!get_contrib(rgbv, sout.ofp)) { |
1307 |
+ |
if (!j) { |
1308 |
+ |
fclose(sout.ofp); |
1309 |
+ |
break; /* ignore empty file */ |
1310 |
+ |
} |
1311 |
+ |
if (j < mp->nbins) { |
1312 |
+ |
sprintf(errmsg, "missing data in '%s'", |
1313 |
+ |
oname); |
1314 |
+ |
error(USER, errmsg); |
1315 |
+ |
} |
1316 |
+ |
break; |
1317 |
+ |
} |
1318 |
+ |
if (j >= mp->nbins) /* grow modifier size */ |
1319 |
+ |
ment->data = (char *)(mp = growmodifier(mp, j+1)); |
1320 |
+ |
copycolor(mp->cbin[j], rgbv); |
1321 |
+ |
if (oent->key == NULL) /* new file entry */ |
1322 |
+ |
oent->key = strcpy((char *) |
1323 |
+ |
malloc(strlen(oname)+1), oname); |
1324 |
+ |
if (oent->data == NULL) |
1325 |
+ |
oent->data = (char *)malloc(sizeof(STREAMOUT)); |
1326 |
+ |
*(STREAMOUT *)oent->data = sout; |
1327 |
+ |
} |
1328 |
+ |
} |
1329 |
+ |
lu_doall(&ofiletab, myclose, NULL); /* close all files */ |
1330 |
+ |
} |
1331 |
+ |
|
1332 |
|
/* seek on the given output file */ |
1333 |
|
static int |
1334 |
|
myseeko(const LUENT *e, void *p) |
1335 |
|
{ |
1336 |
< |
if (fseeko((FILE *)e->data, *(off_t *)p, SEEK_CUR) < 0) { |
1336 |
> |
STREAMOUT *sop = (STREAMOUT *)e->data; |
1337 |
> |
off_t nbytes = *(off_t *)p; |
1338 |
> |
|
1339 |
> |
if (sop->reclen > 1) |
1340 |
> |
nbytes = nbytes * sop->reclen; |
1341 |
> |
if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) { |
1342 |
|
sprintf(errmsg, "seek error on file '%s'", e->key); |
1343 |
|
error(SYSTEM, errmsg); |
1344 |
|
} |
1345 |
+ |
return 0; |
1346 |
|
} |
1347 |
|
|
1348 |
|
/* recover output if possible */ |
1349 |
|
void |
1350 |
|
recover_output(FILE *fin) |
1351 |
|
{ |
1352 |
< |
off_t lastout = -1; |
1353 |
< |
int outvsiz; |
1354 |
< |
char *outvfmt; |
1355 |
< |
int i, j; |
1356 |
< |
MODCONT *mp; |
1357 |
< |
int ofl; |
1358 |
< |
char oname[1024]; |
1359 |
< |
LUENT *ment, *oent; |
1360 |
< |
FILE *fp; |
1361 |
< |
off_t nvals; |
1352 |
> |
off_t lastout = -1; |
1353 |
> |
int outvsiz, recsiz; |
1354 |
> |
char *outvfmt; |
1355 |
> |
int i, j; |
1356 |
> |
MODCONT *mp; |
1357 |
> |
int ofl; |
1358 |
> |
char oname[1024]; |
1359 |
> |
LUENT *ment, *oent; |
1360 |
> |
STREAMOUT sout; |
1361 |
> |
off_t nvals; |
1362 |
> |
int xr, yr; |
1363 |
|
|
1364 |
|
switch (outfmt) { |
1365 |
|
case 'a': |
1387 |
|
mp = (MODCONT *)ment->data; |
1388 |
|
if (mp->outspec == NULL) |
1389 |
|
error(USER, "cannot recover from stdout"); |
1390 |
+ |
if (mp->outspec[0] == '!') |
1391 |
+ |
error(USER, "cannot recover from command"); |
1392 |
|
for (j = 0; ; j++) { /* check each bin's file */ |
1393 |
|
ofl = ofname(oname, mp->outspec, mp->modname, j); |
1394 |
|
if (ofl < 0) |
1395 |
|
error(USER, "bad output file specification"); |
1396 |
|
oent = lu_find(&ofiletab, oname); |
1397 |
< |
if (oent->data != NULL) { /* saw this one already */ |
1397 |
> |
if (oent->data != NULL) { |
1398 |
> |
sout = *(STREAMOUT *)oent->data; |
1399 |
> |
} else { |
1400 |
> |
sout.reclen = 0; |
1401 |
> |
sout.outpipe = 0; |
1402 |
> |
sout.ofp = NULL; |
1403 |
> |
} |
1404 |
> |
if (sout.ofp != NULL) { /* already open? */ |
1405 |
|
if (ofl & OF_BIN) |
1406 |
|
continue; |
1407 |
|
break; |
1408 |
|
} |
1039 |
– |
if (oname[0] == '!') |
1040 |
– |
error(USER, "cannot recover from command"); |
1409 |
|
/* open output */ |
1410 |
< |
fp = fopen(oname, "rb+"); |
1411 |
< |
if (fp == NULL) { |
1410 |
> |
sout.ofp = fopen(oname, "rb+"); |
1411 |
> |
if (sout.ofp == NULL) { |
1412 |
|
if (j) |
1413 |
|
break; /* assume end of modifier */ |
1414 |
|
sprintf(errmsg, "missing recover file '%s'", |
1415 |
|
oname); |
1416 |
< |
error(USER, errmsg); |
1416 |
> |
error(WARNING, errmsg); |
1417 |
> |
break; |
1418 |
|
} |
1419 |
< |
nvals = lseek(fileno(fp), 0, SEEK_END); |
1419 |
> |
nvals = lseek(fileno(sout.ofp), 0, SEEK_END); |
1420 |
|
if (nvals <= 0) { |
1421 |
|
lastout = 0; /* empty output, quit here */ |
1422 |
< |
fclose(fp); |
1422 |
> |
fclose(sout.ofp); |
1423 |
|
break; |
1424 |
|
} |
1425 |
< |
lseek(fileno(fp), 0, SEEK_SET); |
1426 |
< |
if (header) { |
1058 |
< |
int xr, yr; |
1059 |
< |
if (checkheader(fp, outvfmt, NULL) != 1) { |
1425 |
> |
if (!sout.reclen) { |
1426 |
> |
if (!(ofl & OF_BIN)) { |
1427 |
|
sprintf(errmsg, |
1428 |
< |
"format mismatch for '%s'", |
1428 |
> |
"need -bn to recover file '%s'", |
1429 |
|
oname); |
1430 |
|
error(USER, errmsg); |
1431 |
|
} |
1432 |
< |
if (xres > 0 && yres > 0 && |
1433 |
< |
(!fscnresolu(&xr, &yr, fp) || |
1434 |
< |
xr != xres || |
1435 |
< |
yr != yres)) { |
1436 |
< |
sprintf(errmsg, |
1437 |
< |
"resolution mismatch for '%s'", |
1438 |
< |
oname); |
1439 |
< |
error(USER, errmsg); |
1440 |
< |
} |
1432 |
> |
recsiz = outvsiz; |
1433 |
> |
} else |
1434 |
> |
recsiz = outvsiz * sout.reclen; |
1435 |
> |
|
1436 |
> |
lseek(fileno(sout.ofp), 0, SEEK_SET); |
1437 |
> |
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
1438 |
> |
sprintf(errmsg, "format mismatch for '%s'", |
1439 |
> |
oname); |
1440 |
> |
error(USER, errmsg); |
1441 |
|
} |
1442 |
< |
nvals = (nvals - (off_t)ftell(fp)) / outvsiz; |
1443 |
< |
if (lastout < 0 || nvals < lastout) |
1442 |
> |
sout.xr = xres; sout.yr = yres; |
1443 |
> |
if ((sout.xr > 0) & (sout.yr > 0) && |
1444 |
> |
(!fscnresolu(&xr, &yr, sout.ofp) || |
1445 |
> |
(xr != sout.xr) | |
1446 |
> |
(yr != sout.yr))) { |
1447 |
> |
sprintf(errmsg, "resolution mismatch for '%s'", |
1448 |
> |
oname); |
1449 |
> |
error(USER, errmsg); |
1450 |
> |
} |
1451 |
> |
nvals = (nvals - (off_t)ftell(sout.ofp)) / recsiz; |
1452 |
> |
if ((lastout < 0) | (nvals < lastout)) |
1453 |
|
lastout = nvals; |
1454 |
< |
if (oent->key == NULL) /* new entry */ |
1454 |
> |
if (oent->key == NULL) /* new entry */ |
1455 |
|
oent->key = strcpy((char *) |
1456 |
|
malloc(strlen(oname)+1), oname); |
1457 |
< |
oent->data = (char *)fp; |
1457 |
> |
if (oent->data == NULL) |
1458 |
> |
oent->data = (char *)malloc(sizeof(STREAMOUT)); |
1459 |
> |
*(STREAMOUT *)oent->data = sout; |
1460 |
|
if (!(ofl & OF_BIN)) |
1461 |
|
break; /* no bin separation */ |
1462 |
|
} |
1465 |
|
lu_done(&ofiletab); /* reclose all outputs */ |
1466 |
|
return; |
1467 |
|
} |
1468 |
< |
if (j > mp->nbins) { /* preallocate modifier bins */ |
1469 |
< |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + |
1092 |
< |
(j-1)*sizeof(DCOLOR)); |
1093 |
< |
if (mp == NULL) |
1094 |
< |
error(SYSTEM, "out of memory in recover_output"); |
1095 |
< |
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |
1096 |
< |
mp->nbins = j; |
1097 |
< |
ment->data = (char *)mp; |
1098 |
< |
} |
1468 |
> |
if (j > mp->nbins) /* reallocate modifier bins */ |
1469 |
> |
ment->data = (char *)(mp = growmodifier(mp, j)); |
1470 |
|
} |
1471 |
|
if (lastout < 0) { |
1472 |
|
error(WARNING, "no output files to recover"); |
1473 |
|
return; |
1474 |
|
} |
1475 |
< |
if (raysleft && lastout >= raysleft) { |
1475 |
> |
if (raysleft && lastout >= raysleft/accumulate) { |
1476 |
|
error(WARNING, "output appears to be complete"); |
1477 |
|
/* XXX should read & discard input? */ |
1478 |
|
quit(0); |
1480 |
|
/* seek on all files */ |
1481 |
|
nvals = lastout * outvsiz; |
1482 |
|
lu_doall(&ofiletab, myseeko, &nvals); |
1483 |
< |
/* discard input */ |
1483 |
> |
/* skip repeated input */ |
1484 |
|
for (nvals = 0; nvals < lastout; nvals++) |
1485 |
< |
if (getinp(oname, fin) <= 0) |
1485 |
> |
if (getinp(oname, fin) < 0) |
1486 |
|
error(USER, "unexpected EOF on input"); |
1487 |
< |
lastray = lastdone = (unsigned long)lastout; |
1487 |
> |
lastray = lastdone = (unsigned long)lastout * accumulate; |
1488 |
|
if (raysleft) |
1489 |
|
raysleft -= lastray; |
1490 |
|
} |