[ViewVC] Diff of: radiance/ray/src/util/rtcontrib.c

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.1 by greg, Wed May 25 04:45:22 2005 UTC vs.
Revision 1.40 by greg, Sun Feb 5 22:22:21 2006 UTC

#	Line 5 \| Line 5 \| static const char RCSid[] = "$Id$";
5		* Gather rtrace output to compute contributions from particular sources
6		*/
7
8	+	#include "standard.h"
9		#include <ctype.h>
10	<	#include "rtio.h"
10	<	#include "rterror.h"
10	>	#include <signal.h>
11		#include "platform.h"
12		#include "rtprocess.h"
13		#include "selcall.h"
#	Line 16 \| Line 16 \| static const char RCSid[] = "$Id$";
16		#include "lookup.h"
17		#include "calcomp.h"
18
19	<	#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */
20	<	#undef getc
21	<	#undef putc
22	<	#define getc getc_unlocked
23	<	#define putc putc_unlocked
24	<	#define ferror ferror_unlocked
19	>	#ifndef MAXMODLIST
20	>	#define MAXMODLIST 1024 /* maximum modifiers we'll track */
21		#endif
22
27	–	#define MAXMODLIST 1024 /* maximum modifiers we'll track */
28	–
23		int treebufsiz = BUFSIZ; /* current tree buffer size */
24
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 is non-zero. 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
#	Line 43 \| Line 39 \| typedef struct {
39		const char modname; / modifier name */
40		EPNODE binv; / bin value expression */
41		int nbins; /* number of accumulation bins */
42	<	COLOR cbin[1]; /* contribution bins (extends struct) */
42	>	DCOLOR cbin[1]; /* contribution bins (extends struct) */
43		} MODCONT; /* modifier contribution */
44
45		static void mcfree(void p) { epfree(((MODCONT *)p).binv); free(p); }
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	>	#define CNT_UNKNOWN 0 /* unknown record length */
50	>	#define CNT_PIPE (-1) /* output to a pipe */
51	>	/*
52	>	* The STREAMOUT structure holds an open FILE pointer and a count of
53	>	* the number of RGB triplets per record, or CNT_UNKNOWN (0) if
54	>	* unknown or CNT_PIPE (-1) if writing to a command.
55	>	*/
56	>	typedef struct {
57	>	FILE ofp; / output file pointer */
58	>	int reclen; /* triplets/record */
59	>	} STREAMOUT;
60
61	<	LUTAB ofiletab = LU_SINIT(free,closefile); /* output file table */
61	>	/* close output stream and free record */
62	>	static void
63	>	closestream(void *p)
64	>	{
65	>	STREAMOUT sop = (STREAMOUT )p;
66	>	int status;
67	>	if (sop->reclen == CNT_PIPE)
68	>	status = pclose(sop->ofp);
69	>	else
70	>	status = fclose(sop->ofp);
71	>	if (status)
72	>	error(SYSTEM, "error closing output stream");
73	>	free(p);
74	>	}
75
76	<	FILE getofile(const char ospec, const char *mname, int bn);
76	>	LUTAB ofiletab = LU_SINIT(free,closestream); /* output file table */
77
78	+	#define OF_MODIFIER 01
79	+	#define OF_BIN 02
80	+
81	+	STREAMOUT getostream(const char ospec, const char *mname, int bn, int noopen);
82	+	int ofname(char oname, const char ospec, const char *mname, int bn);
83	+	void printheader(FILE fout, const char info);
84	+	void printresolu(FILE *fout);
85	+
86		/*
87		* The rcont structure is used to manage i/o with a particular
88		* rtrace child process. Input is passed unchanged from stdin,
#	Line 66 \| Line 92 \| *FILE getofile(const char ospec, const char mname, i**
92		struct rtproc {
93		struct rtproc next; / next in list of processes */
94		SUBPROC pd; /* rtrace pipe descriptors */
95	<	unsigned long raynum; /* ray number for this buffer */
96	<	int bsiz; /* rtrace buffer length */
97	<	char buf; / rtrace i/o buffer */
98	<	char bpos; / current buffer position */
99	<	}; /* rtrace process */
95	>	unsigned long raynum; /* ray number for this tree */
96	>	int bsiz; /* ray tree buffer length */
97	>	char buf; / ray tree buffer */
98	>	int nbr; /* number of bytes from rtrace */
99	>	}; /* rtrace process buffer */
100
101		/* rtrace command and defaults */
102	<	char *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3",
103	<	"-ab", "1", "-ad", "512", };
102	>	char rtargv[256+2MAXMODLIST] = { "rtrace",
103	>	"-dj", ".5", "-dr", "3",
104	>	"-ab", "1", "-ad", "128", };
105	>
106		int rtargc = 9;
107		/* overriding rtrace options */
108	<	char *myrtopts[] = { "-o-TmWdp", "-h-",
109	<	"-x", "1", "-y", "0", NULL };
108	>	char *myrtopts[] = { "-h-", "-x", "1", "-y", "0",
109	>	"-dt", "0", "-as", "0", "-aa", "0", NULL };
110
111	+	#define RTCOEFF "-o~~TmWdp" /* compute coefficients only */
112	+	#define RTCONTRIB "-o~~TmVdp" /* compute ray contributions */
113	+
114		struct rtproc rt0; /* head of rtrace process list */
115
116		struct rtproc rt_unproc = NULL; / unprocessed ray trees */
117
118		char persistfn[] = "pfXXXXXX"; /* persist file name */
88	–	char fmt[8]; /* rtrace i/o format */
119
120		int gargc; /* global argc */
121		char *gargv; / global argv */
#	Line 97 \| Line 127 \| *int inpfmt = 'a'; / input format /*
127		int outfmt = 'a'; /* output format */
128
129		int header = 1; /* output header? */
130	+	int force_open = 0; /* truncate existing output? */
131		int xres = 0; /* horiz. output resolution */
132		int yres = 0; /* vert. output resolution */
133
134	<	long raysleft; /* number of rays left to trace */
134	>	unsigned long raysleft; /* number of rays left to trace */
135		long waitflush; /* how long until next flush */
136
137		unsigned long lastray = 0; /* last ray number sent */
138		unsigned long lastdone = 0; /* last ray processed */
139
140	+	int using_stdout = 0; /* are we using stdout? */
141	+
142		const char modname[MAXMODLIST]; / ordered modifier name list */
143		int nmods = 0; /* number of modifiers */
144
145	<	MODCONT addmodifier(char modn, char outf, char binv);
145	>	#define queue_length() (lastray - lastdone)
146
147	<	int done_rprocs(struct rtproc *rtp);
147	>	MODCONT growmodifier(MODCONT mp, int nb);
148	>	MODCONT addmodifier(char modn, char outf, char binv, int bincnt);
149	>	void addmodfile(char fname, char outf, char *binv, int bincnt);
150	>
151		void init(int np);
152	<	void tracecontribs(FILE *fp);
152	>	int done_rprocs(struct rtproc *rtp);
153	>	void recover_output(FILE *fin);
154	>	void trace_contribs(FILE *fin);
155		struct rtproc *wait_rproc(void);
156		struct rtproc *get_rproc(void);
157	<	void process_rays(struct rtproc *rtp);
157	>	void queue_raytree(struct rtproc *rtp);
158	>	void process_queue(void);
159
160	<	void add_contrib(const char *modn, float rayval[7]);
160	>	void put_contrib(const DCOLOR cnt, FILE *fout);
161	>	void add_contrib(const char *modn);
162		void done_contrib(void);
163
164	+	/* return number of open rtrace processes */
165	+	static int
166	+	nrtprocs(void)
167	+	{
168	+	int nrtp = 0;
169	+	struct rtproc *rtp;
170	+
171	+	for (rtp = &rt0; rtp != NULL; rtp = rtp->next)
172	+	nrtp += rtp->pd.running;
173	+	return(nrtp);
174	+	}
175	+
176		/* set input/output format */
177		static void
178		setformat(const char *fmt)
179		{
180		switch (fmt[0]) {
129	–	case 'a':
181		case 'f':
182		case 'd':
183	+	SET_FILE_BINARY(stdin);
184	+	/* fall through */
185	+	case 'a':
186		inpfmt = fmt[0];
187		break;
188		default:
#	Line 158 \| Line 212 \| fmterr:
212		int
213		main(int argc, char *argv[])
214		{
215	+	int contrib = 0;
216		int nprocs = 1;
217	+	int recover = 0;
218		char *curout = NULL;
219		char *binval = NULL;
220	<	int i;
221	<	/* set global argument list */
222	<	gargc = argc;
220	>	int bincnt = 0;
221	>	char fmt[8];
222	>	int i, j;
223	>	/* need at least one argument */
224	>	if (argc < 2) {
225	>	fprintf(stderr,
226	>	"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-b binv] {-m mod \| -M file} [rtrace options] octree\n",
227	>	argv[0]);
228	>	exit(1);
229	>	}
230	>	/* global program name */
231		gargv = argv;
232	<	/* set up calcomp functions */
232	>	/* initialize calcomp routines */
233		esupport \|= E_VARIABLE\|E_FUNCTION\|E_INCHAN\|E_RCONST\|E_REDEFW;
234		esupport &= ~(E_OUTCHAN);
235	+	varset("PI", ':', PI);
236		/* get our options */
237	<	for (i = 1; i < argc && argv[i][0] == '-'; i++) {
238	<	switch (argv[i][1]) {
239	<	case 'n': /* number of processes */
240	<	if (argv[i][2] \|\| i >= argc-1) break;
241	<	nprocs = atoi(argv[++i]);
242	<	if (nprocs <= 0)
243	<	error(USER, "illegal number of processes");
244	<	continue;
245	<	case 'h': /* output header? */
246	<	switch (argv[i][2]) {
247	<	case '\0':
248	<	header = !header;
237	>	for (i = 1; i < argc-1; i++) {
238	>	/* expand arguments */
239	>	while ((j = expandarg(&argc, &argv, i)) > 0)
240	>	;
241	>	if (j < 0) {
242	>	fprintf(stderr, "%s: cannot expand '%s'",
243	>	argv[0], argv[i]);
244	>	exit(1);
245	>	}
246	>	if (argv[i][0] == '-')
247	>	switch (argv[i][1]) {
248	>	case 'n': /* number of processes */
249	>	if (argv[i][2] \|\| i >= argc-2) break;
250	>	nprocs = atoi(argv[++i]);
251	>	if (nprocs <= 0)
252	>	error(USER, "illegal number of processes");
253		continue;
254	<	case '+': case '1': case 'T': case 't':
255	<	header = 1;
254	>	case 'V': /* output contributions */
255	>	switch (argv[i][2]) {
256	>	case '\0':
257	>	contrib = !contrib;
258	>	continue;
259	>	case '+': case '1':
260	>	case 'T': case 't':
261	>	case 'Y': case 'y':
262	>	contrib = 1;
263	>	continue;
264	>	case '-': case '0':
265	>	case 'F': case 'f':
266	>	case 'N': case 'n':
267	>	contrib = 0;
268	>	continue;
269	>	}
270	>	break;
271	>	case 'r': /* recover output */
272	>	if (argv[i][2]) break;
273	>	recover++;
274		continue;
275	<	case '-': case '0': case 'F': case 'f':
276	<	header = 0;
275	>	case 'h': /* output header? */
276	>	switch (argv[i][2]) {
277	>	case '\0':
278	>	header = !header;
279	>	continue;
280	>	case '+': case '1':
281	>	case 'T': case 't':
282	>	case 'Y': case 'y':
283	>	header = 1;
284	>	continue;
285	>	case '-': case '0':
286	>	case 'F': case 'f':
287	>	case 'N': case 'n':
288	>	header = 0;
289	>	continue;
290	>	}
291	>	break;
292	>	case 'f': /* file or force or format */
293	>	if (!argv[i][2]) {
294	>	char *fpath;
295	>	if (i >= argc-2) break;
296	>	fpath = getpath(argv[++i],
297	>	getrlibpath(), R_OK);
298	>	if (fpath == NULL) {
299	>	sprintf(errmsg,
300	>	"cannot find file '%s'",
301	>	argv[i]);
302	>	error(USER, errmsg);
303	>	}
304	>	fcompile(fpath);
305	>	continue;
306	>	}
307	>	if (argv[i][2] == 'o') {
308	>	force_open++;
309	>	continue;
310	>	}
311	>	setformat(argv[i]+2);
312		continue;
313	<	}
314	<	break;
315	<	case 'f': /* file or i/o format */
194	<	if (!argv[i][2]) {
195	<	if (i >= argc-1) break;
196	<	fcompile(argv[++i]);
313	>	case 'e': /* expression */
314	>	if (argv[i][2] \|\| i >= argc-2) break;
315	>	scompile(argv[++i], NULL, 0);
316		continue;
317	+	case 'o': /* output file spec. */
318	+	if (argv[i][2] \|\| i >= argc-2) break;
319	+	curout = argv[++i];
320	+	continue;
321	+	case 'x': /* horiz. output resolution */
322	+	if (argv[i][2] \|\| i >= argc-2) break;
323	+	xres = atoi(argv[++i]);
324	+	continue;
325	+	case 'y': /* vert. output resolution */
326	+	if (argv[i][2] \|\| i >= argc-2) break;
327	+	yres = atoi(argv[++i]);
328	+	continue;
329	+	case 'b': /* bin expression/count */
330	+	if (i >= argc-2) break;
331	+	if (argv[i][2] == 'n') {
332	+	bincnt = atoi(argv[++i]);
333	+	continue;
334	+	}
335	+	if (argv[i][2]) break;
336	+	binval = argv[++i];
337	+	continue;
338	+	case 'm': /* modifier name */
339	+	if (argv[i][2] \|\| i >= argc-2) break;
340	+	rtargv[rtargc++] = "-ti";
341	+	rtargv[rtargc++] = argv[++i];
342	+	addmodifier(argv[i], curout, binval, bincnt);
343	+	continue;
344	+	case 'M': /* modifier file */
345	+	if (argv[i][2] \|\| i >= argc-2) break;
346	+	rtargv[rtargc++] = "-tI";
347	+	rtargv[rtargc++] = argv[++i];
348	+	addmodfile(argv[i], curout, binval, bincnt);
349	+	continue;
350	+	case 'P': /* persist file */
351	+	error(USER, "persist file is automatic");
352	+	break;
353		}
354	<	setformat(argv[i]+2);
200	<	continue;
201	<	case 'e': /* expression */
202	<	if (argv[i][2] \|\| i >= argc-1) break;
203	<	scompile(argv[++i], NULL, 0);
204	<	continue;
205	<	case 'o': /* output file spec. */
206	<	if (argv[i][2] \|\| i >= argc-1) break;
207	<	curout = argv[++i];
208	<	continue;
209	<	case 'x': /* horiz. output resolution */
210	<	if (argv[i][2] \|\| i >= argc-1) break;
211	<	xres = atoi(argv[++i]);
212	<	continue;
213	<	case 'y': /* vert. output resolution */
214	<	if (argv[i][2] \|\| i >= argc-1) break;
215	<	yres = atoi(argv[++i]);
216	<	continue;
217	<	case 'l': /* limit distance? */
218	<	if (argv[i][2] != 'd') break;
219	<	rtargv[rtargc++] = argv[i];
220	<	continue;
221	<	case 'b': /* bin expression */
222	<	if (argv[i][2] \|\| i >= argc-1) break;
223	<	binval = argv[++i];
224	<	continue;
225	<	case 'm': /* modifier name */
226	<	if (argv[i][2] \|\| i >= argc-1) break;
227	<	rtargv[rtargc++] = "-ti";
228	<	rtargv[rtargc++] = argv[++i];
229	<	addmodifier(argv[i], curout, binval);
230	<	continue;
231	<	}
232	<	break; /* break into rtrace options */
354	>	rtargv[rtargc++] = argv[i]; /* assume rtrace option */
355		}
356	<	for ( ; i < argc; i++) /* transfer rtrace-specific options */
357	<	rtargv[rtargc++] = argv[i];
236	<	if (!strcmp(rtargv[--rtargc], "-defaults"))
237	<	nprocs = 0;
238	<	if (nprocs > 1) { /* add persist file if parallel invocation */
239	<	rtargv[rtargc++] = "-PP";
240	<	rtargv[rtargc++] = mktemp(persistfn);
241	<	}
356	>	/* set global argument list */
357	>	gargc = argc; gargv = argv;
358		/* add "mandatory" rtrace settings */
359	<	for (i = 0; myrtopts[i] != NULL; i++)
360	<	rtargv[rtargc++] = myrtopts[i];
361	<	if (!nprocs) { /* just asking for defaults? */
359	>	for (j = 0; myrtopts[j] != NULL; j++)
360	>	rtargv[rtargc++] = myrtopts[j];
361	>	rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF;
362	>	/* just asking for defaults? */
363	>	if (!strcmp(argv[i], "-defaults")) {
364		char sxres[16], syres[16];
365		char *rtpath;
366	<	printf("-n 1\t\t\t\t# number of processes\n", nprocs);
366	>	printf("-n %-2d\t\t\t\t# number of processes\n", nprocs);
367	>	printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
368	>	contrib ? "contributions" : "coefficients");
369		fflush(stdout); /* report OUR options */
370		rtargv[rtargc++] = header ? "-h+" : "-h-";
371		sprintf(fmt, "-f%c%c", inpfmt, outfmt);
#	Line 256 \| Line 376 \| *main(int argc, char argv[])**
376		rtargv[rtargc++] = "-y";
377		sprintf(syres, "%d", yres);
378		rtargv[rtargc++] = syres;
259	–	rtargv[rtargc++] = "-oW";
379		rtargv[rtargc++] = "-defaults";
380		rtargv[rtargc] = NULL;
381		rtpath = getpath(rtargv[0], getenv("PATH"), X_OK);
#	Line 269 \| Line 388 \| *main(int argc, char argv[])**
388		perror(rtpath); /* execv() should not return */
389		exit(1);
390		}
391	<	if (!nmods)
392	<	error(USER, "No modifiers specified");
393	<	if (argc < 2 \|\| argv[argc-1][0] == '-')
394	<	error(USER, "missing octree argument");
391	>	if (nprocs > 1) { /* add persist file if parallel */
392	>	rtargv[rtargc++] = "-PP";
393	>	rtargv[rtargc++] = mktemp(persistfn);
394	>	}
395		/* add format string */
396		sprintf(fmt, "-f%cf", inpfmt);
397		rtargv[rtargc++] = fmt;
398		/* octree argument is last */
399	<	rtargv[rtargc++] = octree = argv[argc-1];
399	>	if (i <= 0 \|\| i != argc-1 \|\| argv[i][0] == '-')
400	>	error(USER, "missing octree argument");
401	>	rtargv[rtargc++] = octree = argv[i];
402		rtargv[rtargc] = NULL;
403	<	/* start rtrace & sum contributions */
403	>	/* start rtrace */
404		init(nprocs);
405	<	tracecontribs(stdin);
405	>	if (recover) /* perform recovery if requested */
406	>	recover_output(stdin);
407	>	trace_contribs(stdin); /* compute contributions */
408		quit(0);
409		}
410
411	+	#ifndef SIGALRM
412	+	#define SIGALRM SIGTERM
413	+	#endif
414		/* kill persistent rtrace process */
415		static void
416		killpersist(void)
417		{
418		FILE *fp = fopen(persistfn, "r");
419	<	int pid;
419	>	RT_PID pid;
420
421		if (fp == NULL)
422		return;
#	Line 333 \| Line 459 \| quit(int status)
459		exit(status); /* flushes all output streams */
460		}
461
462	<	/* start rtrace and initialize buffers */
462	>	/* start rtrace processes and initialize */
463		void
464		init(int np)
465		{
466		struct rtproc *rtp;
467		int i;
468		int maxbytes;
469	+	/* make sure we have something to do */
470	+	if (!nmods)
471	+	error(USER, "No modifiers specified");
472		/* assign ray variables */
473		scompile("Dx=$1;Dy=$2;Dz=$3;", NULL, 0);
474		scompile("Px=$4;Py=$5;Pz=$6;", NULL, 0);
475		/* set up signal handling */
476	<	#ifdef SIGPIPE /* not present on Windows */
476	>	signal(SIGINT, quit);
477	>	#ifdef SIGHUP
478	>	signal(SIGHUP, quit);
479	>	#endif
480	>	#ifdef SIGTERM
481	>	signal(SIGTERM, quit);
482	>	#endif
483	>	#ifdef SIGPIPE
484		signal(SIGPIPE, quit);
485		#endif
486		rtp = &rt0; /* start rtrace process(es) */
#	Line 360 \| Line 496 \| init(int np)
496		error(SYSTEM, "cannot start rtrace process");
497		if (maxbytes > treebufsiz)
498		treebufsiz = maxbytes;
499	+	rtp->raynum = 0;
500		rtp->bsiz = 0;
501		rtp->buf = NULL;
502	<	rtp->raynum = 0;
502	>	rtp->nbr = 0;
503		if (i == np) /* last process? */
504		break;
505		if (i == 1)
#	Line 375 \| Line 512 \| init(int np)
512		rtp->next = NULL; /* terminate list */
513		if (yres > 0) {
514		if (xres > 0)
515	<	raysleft = xres*yres;
515	>	raysleft = (unsigned long)xres*yres;
516		else
517		raysleft = yres;
518		} else
#	Line 383 \| Line 520 \| init(int np)
520		waitflush = xres;
521		}
522
523	+	/* grow modifier to accommodate more bins */
524	+	MODCONT *
525	+	growmodifier(MODCONT *mp, int nb)
526	+	{
527	+	if (nb <= mp->nbins)
528	+	return mp;
529	+	mp = (MODCONT )realloc(mp, sizeof(MODCONT) + sizeof(DCOLOR)(nb-1));
530	+	if (mp == NULL)
531	+	error(SYSTEM, "out of memory in growmodifier");
532	+	memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(nb-mp->nbins));
533	+	mp->nbins = nb;
534	+	return mp;
535	+	}
536	+
537		/* add modifier to our list to track */
538		MODCONT *
539	<	addmodifier(char modn, char outf, char *binv)
539	>	addmodifier(char modn, char outf, char *binv, int bincnt)
540		{
541		LUENT *lep = lu_find(&modconttab, modn);
542		MODCONT *mp;
543	+	int i;
544
545		if (lep->data != NULL) {
546		sprintf(errmsg, "duplicate modifier '%s'", modn);
#	Line 401 \| Line 553 \| *addmodifier(char modn, char outf, char binv)**
553		mp = (MODCONT *)malloc(sizeof(MODCONT));
554		if (mp == NULL)
555		error(SYSTEM, "out of memory in addmodifier");
404	–	lep->data = (char *)mp;
556		mp->outspec = outf; /* XXX assumes static string */
557		mp->modname = modn; /* XXX assumes static string */
558		if (binv != NULL)
#	Line 410 \| Line 561 \| *addmodifier(char modn, char outf, char binv)**
561		mp->binv = eparse("0");
562		mp->nbins = 1;
563		setcolor(mp->cbin[0], 0., 0., 0.);
564	+	if (mp->binv->type == NUM) /* assume one bin if constant */
565	+	bincnt = 1;
566	+	else if (bincnt > 1)
567	+	mp = growmodifier(mp, bincnt);
568	+	lep->data = (char *)mp;
569	+	/* allocate output streams */
570	+	for (i = outf==NULL \|\| outf[0]=='!' ? 0 : bincnt; i--; )
571	+	getostream(mp->outspec, mp->modname, i, 1);
572		return mp;
573		}
574
575	+	/* add modifiers from a file list */
576	+	void
577	+	addmodfile(char fname, char outf, char *binv, int bincnt)
578	+	{
579	+	char *mname[MAXMODLIST];
580	+	int i;
581	+	/* find the file & store strings */
582	+	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
583	+	sprintf(errmsg, "cannot find modifier file '%s'", fname);
584	+	error(SYSTEM, errmsg);
585	+	}
586	+	for (i = 0; mname[i]; i++) /* add each one */
587	+	addmodifier(mname[i], outf, binv, bincnt);
588	+	}
589	+
590		/* put string to stderr */
591		void
592		eputs(char *s)
#	Line 428 \| Line 602 \| *eputs(char s)**
602		midline = s[strlen(s)-1] != '\n';
603		}
604
605	+	/* construct output file name and return flags whether modifier/bin present */
606	+	int
607	+	ofname(char oname, const char ospec, const char *mname, int bn)
608	+	{
609	+	const char *mnp = NULL;
610	+	const char *bnp = NULL;
611	+	const char *cp;
612	+
613	+	if (ospec == NULL)
614	+	return -1;
615	+	for (cp = ospec; cp; cp++) / check format position(s) */
616	+	if (*cp == '%') {
617	+	do
618	+	++cp;
619	+	while (isdigit(*cp));
620	+	switch (*cp) {
621	+	case '%':
622	+	break;
623	+	case 's':
624	+	if (mnp != NULL)
625	+	return -1;
626	+	mnp = cp;
627	+	break;
628	+	case 'd':
629	+	if (bnp != NULL)
630	+	return -1;
631	+	bnp = cp;
632	+	break;
633	+	default:
634	+	return -1;
635	+	}
636	+	}
637	+	if (mnp != NULL) { /* create file name */
638	+	if (bnp != NULL) {
639	+	if (bnp > mnp)
640	+	sprintf(oname, ospec, mname, bn);
641	+	else
642	+	sprintf(oname, ospec, bn, mname);
643	+	return OF_MODIFIER\|OF_BIN;
644	+	}
645	+	sprintf(oname, ospec, mname);
646	+	return OF_MODIFIER;
647	+	}
648	+	if (bnp != NULL) {
649	+	sprintf(oname, ospec, bn);
650	+	return OF_BIN;
651	+	}
652	+	strcpy(oname, ospec);
653	+	return 0;
654	+	}
655	+
656		/* write header to the given output stream */
657		void
658	<	printheader(FILE *fout)
658	>	printheader(FILE fout, const char info)
659		{
660		extern char VersionID[];
661		FILE *fin = fopen(octree, "r");
662
663		if (fin == NULL)
664		quit(1);
665	<	getheader(fin, (gethfunc )fputs, fout); / copy octree header */
665	>	checkheader(fin, "ignore", fout); /* copy octree header */
666		fclose(fin);
667		printargs(gargc-1, gargv, fout); /* add our command */
668		fprintf(fout, "SOFTWARE= %s\n", VersionID);
669		fputnow(fout);
670	+	if (info != NULL) /* add extra info if given */
671	+	fputs(info, fout);
672		switch (outfmt) { /* add output format */
673		case 'a':
674		fputformat("ascii", fout);
#	Line 457 \| Line 684 \| *printheader(FILE fout)**
684		break;
685		}
686		fputc('\n', fout);
687	+	}
688	+
689	+	/* write resolution string to given output stream */
690	+	void
691	+	printresolu(FILE *fout)
692	+	{
693		if (xres > 0) {
694		if (yres > 0) /* resolution string */
695		fprtresolu(xres, yres, fout);
#	Line 464 \| Line 697 \| *printheader(FILE fout)**
697		}
698		}
699
700	<	/* Get output file pointer (open and write header if new) */
701	<	FILE *
702	<	getofile(const char ospec, const char mname, int bn)
700	>	/* Get output stream pointer (open and write header if new and noopen==0) */
701	>	STREAMOUT *
702	>	getostream(const char ospec, const char mname, int bn, int noopen)
703		{
704	<	static int using_stdout = 0;
705	<	const char *mnp = NULL;
706	<	const char *bnp = NULL;
707	<	const char *cp;
708	<	char ofname[1024];
476	<	LUENT *lep;
704	>	static STREAMOUT stdos;
705	>	int ofl;
706	>	char oname[1024];
707	>	LUENT *lep;
708	>	STREAMOUT *sop;
709
710		if (ospec == NULL) { /* use stdout? */
711	<	if (!using_stdout && header)
712	<	printheader(stdout);
713	<	using_stdout = 1;
714	<	return stdout;
715	<	}
716	<	for (cp = ospec; cp; cp++) / check format position(s) */
717	<	if (*cp == '%') {
718	<	do
487	<	++cp;
488	<	while (isdigit(*cp));
489	<	switch (*cp) {
490	<	case '%':
491	<	break;
492	<	case 's':
493	<	if (mnp != NULL)
494	<	goto badspec;
495	<	mnp = cp;
496	<	break;
497	<	case 'd':
498	<	if (bnp != NULL)
499	<	goto badspec;
500	<	bnp = cp;
501	<	break;
502	<	default:
503	<	goto badspec;
504	<	}
711	>	if (!noopen && !using_stdout) {
712	>	stdos.reclen = 0;
713	>	if (outfmt != 'a')
714	>	SET_FILE_BINARY(stdout);
715	>	if (header)
716	>	printheader(stdout, NULL);
717	>	printresolu(stdout);
718	>	using_stdout = 1;
719		}
720	<	if (mnp != NULL) { /* create file name */
721	<	if (bnp != NULL) {
722	<	if (bnp > mnp)
723	<	sprintf(ofname, ospec, mname, bn);
724	<	else
725	<	sprintf(ofname, ospec, bn, mname);
726	<	} else
727	<	sprintf(ofname, ospec, mname);
728	<	} else if (bnp != NULL)
729	<	sprintf(ofname, ospec, bn);
516	<	else
517	<	strcpy(ofname, ospec);
518	<	lep = lu_find(&ofiletab, ofname); /* look it up */
720	>	stdos.ofp = stdout;
721	>	stdos.reclen += noopen;
722	>	return &stdos;
723	>	}
724	>	ofl = ofname(oname, ospec, mname, bn); /* get output name */
725	>	if (ofl < 0) {
726	>	sprintf(errmsg, "bad output format '%s'", ospec);
727	>	error(USER, errmsg);
728	>	}
729	>	lep = lu_find(&ofiletab, oname); /* look it up */
730		if (lep->key == NULL) /* new entry */
731	<	lep->key = strcpy((char *)malloc(strlen(ofname)+1), ofname);
732	<	if (lep->data == NULL) { /* open output file */
733	<	lep->data = (char *)fopen(ofname, "w");
734	<	if (lep->data == NULL) {
735	<	sprintf(errmsg, "cannot open '%s' for writing", ofname);
731	>	lep->key = strcpy((char *)malloc(strlen(oname)+1), oname);
732	>	sop = (STREAMOUT *)lep->data;
733	>	if (sop == NULL) { /* allocate stream */
734	>	sop = (STREAMOUT *)malloc(sizeof(STREAMOUT));
735	>	if (sop == NULL)
736	>	error(SYSTEM, "out of memory in getostream");
737	>	sop->reclen = oname[0] == '!' ? CNT_PIPE : CNT_UNKNOWN;
738	>	sop->ofp = NULL; /* open iff noopen==0 */
739	>	lep->data = (char *)sop;
740	>	}
741	>	if (!noopen && sop->ofp == NULL) { /* open output stream */
742	>	long i;
743	>	if (oname[0] == '!') /* output to command */
744	>	sop->ofp = popen(oname+1, "w");
745	>	else if (!force_open && access(oname, F_OK) == 0)
746	>	errno = EEXIST; /* file exists */
747	>	else /* else open it */
748	>	sop->ofp = fopen(oname, "w");
749	>	if (sop->ofp == NULL) {
750	>	sprintf(errmsg, "cannot open '%s' for writing", oname);
751		error(SYSTEM, errmsg);
752		}
753	<	if (header)
754	<	printheader((FILE *)lep->data);
753	>	if (outfmt != 'a')
754	>	SET_FILE_BINARY(sop->ofp);
755	>	if (header) {
756	>	char info[512];
757	>	char *cp = info;
758	>	if (ofl & OF_MODIFIER \|\| sop->reclen == 1) {
759	>	sprintf(cp, "MODIFIER=%s\n", mname);
760	>	while (*cp) ++cp;
761	>	}
762	>	if (ofl & OF_BIN) {
763	>	sprintf(cp, "BIN=%d\n", bn);
764	>	while (*cp) ++cp;
765	>	}
766	>	*cp = '\0';
767	>	printheader(sop->ofp, info);
768	>	}
769	>	printresolu(sop->ofp);
770	>	/* play catch-up */
771	>	for (i = sop->reclen > 1 ? sop->reclen*lastdone : lastdone;
772	>	i--; ) {
773	>	static const DCOLOR nocontrib = BLKCOLOR;
774	>	put_contrib(nocontrib, sop->ofp);
775	>	if (outfmt == 'a')
776	>	putc('\n', sop->ofp);
777	>	}
778	>	if (xres > 0)
779	>	fflush(sop->ofp);
780		}
781	<	return (FILE )lep->data; / return open file pointer */
782	<	badspec:
783	<	sprintf(errmsg, "bad output format '%s'", ospec);
533	<	error(USER, errmsg);
534	<	return NULL; /* pro forma return */
781	>	if (sop->reclen != CNT_PIPE) /* add to length if noopen */
782	>	sop->reclen += noopen;
783	>	return sop; /* return open stream */
784		}
785
786		/* read input ray into buffer */
787		int
788		getinp(char buf, FILE fp)
789		{
790	+	double dv[3];
791	+	float fv[3];
792	+	char *cp;
793	+	int i;
794	+
795		switch (inpfmt) {
796		case 'a':
797	<	if (fgets(buf, 128, fp) == NULL)
798	<	return 0;
797	>	cp = buf; /* make sure we get 6 floats */
798	>	for (i = 0; i < 6; i++) {
799	>	if (fgetword(cp, buf+127-cp, fp) == NULL)
800	>	return -1;
801	>	if (i >= 3)
802	>	dv[i-3] = atof(cp);
803	>	if ((cp = fskip(cp)) == NULL \|\| *cp)
804	>	return -1;
805	>	*cp++ = ' ';
806	>	}
807	>	getc(fp); /* get/put eol */
808	>	cp-- = '\0'; cp = '\n';
809	>	if (DOT(dv,dv) <= FTINY*FTINY)
810	>	return 0; /* dummy ray */
811		return strlen(buf);
812		case 'f':
813		if (fread(buf, sizeof(float), 6, fp) < 6)
814	<	return 0;
814	>	return -1;
815	>	memcpy(fv, buf+3sizeof(float), 3sizeof(float));
816	>	if (DOT(fv,fv) <= FTINY*FTINY)
817	>	return 0; /* dummy ray */
818		return sizeof(float)*6;
819		case 'd':
820		if (fread(buf, sizeof(double), 6, fp) < 6)
821	<	return 0;
821	>	return -1;
822	>	memcpy(dv, buf+3sizeof(double), 3sizeof(double));
823	>	if (DOT(dv,dv) <= FTINY*FTINY)
824	>	return 0; /* dummy ray */
825		return sizeof(double)*6;
826		}
827		error(INTERNAL, "botched input format");
828	<	return 0; /* pro forma return */
828	>	return -1; /* pro forma return */
829		}
830
831	<	static const float rparams = NULL; / ray parameter pointer */
831	>	static float rparams[9]; /* traced ray parameters */
832
833		/* return channel (ray) value */
834		double
#	Line 564 \| Line 836 \| chanvalue(int n)
836		{
837		if (--n < 0 \|\| n >= 6)
838		error(USER, "illegal channel number ($N)");
839	<	if (rparams == NULL)
568	<	error(USER, "illegal use of $N in constant expression");
569	<	return rparams[n];
839	>	return rparams[n+3];
840		}
841
842	<	/* add ray contribution to the appropriate modifier bin */
842	>	/* add current ray contribution to the appropriate modifier bin */
843		void
844	<	add_contrib(const char *modn, float rayval[9])
844	>	add_contrib(const char *modn)
845		{
846		LUENT *le = lu_find(&modconttab, modn);
847		MODCONT mp = (MODCONT )le->data;
#	Line 581 \| Line 851 \| *add_contrib(const char modn, float rayval[9])**
851		sprintf(errmsg, "unexpected modifier '%s' from rtrace", modn);
852		error(USER, errmsg);
853		}
854	<	rparams = rayval + 3; /* for chanvalue */
585	<	eclock++;
854	>	eclock++; /* get bin number */
855		bn = (int)(evalue(mp->binv) + .5);
856		if (bn <= 0)
857		bn = 0;
858	<	else if (bn > mp->nbins) { /* new bin */
859	<	mp = (MODCONT *)realloc(mp, sizeof(MODCONT) +
860	<	bn*sizeof(COLOR));
592	<	if (mp == NULL)
593	<	error(SYSTEM, "out of memory in add_contrib");
594	<	memset(mp->cbin+mp->nbins, 0, sizeof(COLOR)*(bn+1-mp->nbins));
595	<	mp->nbins = bn+1;
596	<	le->data = (char *)mp;
597	<	}
598	<	addcolor(mp->cbin[bn], rayval);
599	<	rparams = NULL;
858	>	else if (bn >= mp->nbins) /* new bin */
859	>	le->data = (char *)(mp = growmodifier(mp, bn+1));
860	>	addcolor(mp->cbin[bn], rparams);
861		}
862
863		/* output newline to ASCII file and/or flush as requested */
864		static int
865		puteol(const LUENT e, void p)
866		{
867	<	FILE fp = (FILE )e->data;
867	>	STREAMOUT sop = (STREAMOUT )e->data;
868
869		if (outfmt == 'a')
870	<	putc('\n', fp);
870	>	putc('\n', sop->ofp);
871		if (!waitflush)
872	<	fflush(fp);
873	<	if (ferror(fp)) {
872	>	fflush(sop->ofp);
873	>	if (ferror(sop->ofp)) {
874		sprintf(errmsg, "write error on file '%s'", e->key);
875		error(SYSTEM, errmsg);
876		}
877		return 0;
878		}
879
880	+	/* put out ray contribution to file */
881	+	void
882	+	put_contrib(const DCOLOR cnt, FILE *fout)
883	+	{
884	+	float fv[3];
885	+	COLR cv;
886	+
887	+	switch (outfmt) {
888	+	case 'a':
889	+	fprintf(fout, "%.6e\t%.6e\t%.6e\t", cnt[0], cnt[1], cnt[2]);
890	+	break;
891	+	case 'f':
892	+	fv[0] = cnt[0];
893	+	fv[1] = cnt[1];
894	+	fv[2] = cnt[2];
895	+	fwrite(fv, sizeof(float), 3, fout);
896	+	break;
897	+	case 'd':
898	+	fwrite(cnt, sizeof(double), 3, fout);
899	+	break;
900	+	case 'c':
901	+	setcolr(cv, cnt[0], cnt[1], cnt[2]);
902	+	fwrite(cv, sizeof(cv), 1, fout);
903	+	break;
904	+	default:
905	+	error(INTERNAL, "botched output format");
906	+	}
907	+	}
908	+
909		/* output ray tallies and clear for next primary */
910		void
911		done_contrib(void)
912		{
913	<	int i, j;
914	<	MODCONT *mp;
915	<	FILE *fout;
626	<	double dv[3];
627	<	COLR cv;
913	>	int i, j;
914	>	MODCONT *mp;
915	>	STREAMOUT *sop;
916		/* output modifiers in order */
917		for (i = 0; i < nmods; i++) {
918		mp = (MODCONT *)lu_find(&modconttab,modname[i])->data;
919	<	for (j = 0; j < mp->nbins; j++) {
920	<	fout = getofile(mp->outspec, mp->modname, j);
921	<	switch (outfmt) {
922	<	case 'a':
923	<	fprintf(fout, "%.6e\t%.6e\t%.6e\t",
924	<	mp->cbin[j][RED],
925	<	mp->cbin[j][GRN],
926	<	mp->cbin[j][BLU]);
927	<	break;
928	<	case 'f':
641	<	fwrite(mp->cbin[j], sizeof(float), 3, fout);
642	<	break;
643	<	case 'd':
644	<	dv[0] = mp->cbin[j][0];
645	<	dv[1] = mp->cbin[j][1];
646	<	dv[2] = mp->cbin[j][2];
647	<	fwrite(dv, sizeof(double), 3, fout);
648	<	break;
649	<	case 'c':
650	<	setcolr(cv, mp->cbin[j][RED],
651	<	mp->cbin[j][GRN], mp->cbin[j][BLU]);
652	<	fwrite(cv, sizeof(COLR), 1, fout);
653	<	break;
654	<	default:
655	<	error(INTERNAL, "botched output format");
656	<	}
657	<	}
919	>	sop = getostream(mp->outspec, mp->modname, 0,0);
920	>	put_contrib(mp->cbin[0], sop->ofp);
921	>	if (mp->nbins > 3 && /* minor optimization */
922	>	sop == getostream(mp->outspec, mp->modname, 1,0))
923	>	for (j = 1; j < mp->nbins; j++)
924	>	put_contrib(mp->cbin[j], sop->ofp);
925	>	else
926	>	for (j = 1; j < mp->nbins; j++)
927	>	put_contrib(mp->cbin[j],
928	>	getostream(mp->outspec,mp->modname,j,0)->ofp);
929		/* clear for next ray tree */
930	<	memset(mp->cbin, 0, sizeof(COLOR)*mp->nbins);
930	>	memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins);
931		}
932		--waitflush; /* terminate records */
933		lu_doall(&ofiletab, puteol, NULL);
934	<	if (!waitflush)
934	>	if (using_stdout & (outfmt == 'a'))
935	>	putc('\n', stdout);
936	>	if (!waitflush) {
937		waitflush = xres;
938	+	if (using_stdout)
939	+	fflush(stdout);
940	+	}
941		}
942
943	<	/* process (or save) ray tree produced by rtrace process */
943	>	/* queue completed ray tree produced by rtrace process */
944		void
945	<	process_rays(struct rtproc *rtp)
945	>	queue_raytree(struct rtproc *rtp)
946		{
947	<	struct rtproc *rtu;
948	<	/* check if time to process it */
949	<	if (rtp->raynum == lastdone+1) {
950	<	int n = rtp->bpos - rtp->buf;
947	>	struct rtproc rtu, rtl = NULL;
948	>	/* insert following ray order */
949	>	for (rtu = rt_unproc; rtu != NULL; rtu = (rtl=rtu)->next)
950	>	if (rtp->raynum < rtu->raynum)
951	>	break;
952	>	rtu = (struct rtproc *)malloc(sizeof(struct rtproc));
953	>	if (rtu == NULL)
954	>	error(SYSTEM, "out of memory in queue_raytree");
955	>	rtu = rtp;
956	>	if (rtl == NULL) {
957	>	rtu->next = rt_unproc;
958	>	rt_unproc = rtu;
959	>	} else {
960	>	rtu->next = rtl->next;
961	>	rtl->next = rtu;
962	>	}
963	>	rtp->raynum = 0; /* clear path for next ray tree */
964	>	rtp->bsiz = 0;
965	>	rtp->buf = NULL;
966	>	rtp->nbr = 0;
967	>	}
968	>
969	>	/* process completed ray trees from our queue */
970	>	void
971	>	process_queue(void)
972	>	{
973	>	char modname[128];
974	>	/* ray-ordered queue */
975	>	while (rt_unproc != NULL && rt_unproc->raynum == lastdone+1) {
976	>	struct rtproc *rtp = rt_unproc;
977	>	int n = rtp->nbr;
978		const char *cp = rtp->buf;
979		while (n > 0) { /* process rays */
980	<	char matname[128];
678	<	char *mnp = matname;
980	>	register char *mnp = modname;
981		/* skip leading tabs */
982		while (n > 0 && *cp == '\t') {
983		cp++; n--;
984		}
985	<	/* get material name */
986	<	while (n > 0 && *cp != '\t') {
985	>	if (!n \|\| !(isalpha(cp) \| (cp == '_')))
986	>	error(USER, "bad modifier name from rtrace");
987	>	/* get modifier name */
988	>	while (n > 1 && *cp != '\t') {
989	>	if (mnp - modname >= sizeof(modname)-2)
990	>	error(INTERNAL, "modifier name too long");
991		mnp++ = cp++; n--;
992		}
687	–	if (!n)
688	–	error(USER, "botched modifer name from rtrace");
993		*mnp = '\0';
994	<	cp++; n--; /* skip terminating tab */
994	>	cp++; n--; /* eat following tab */
995		if (n < (int)(sizeof(float)*9))
996		error(USER, "incomplete ray value from rtrace");
997		/* add ray contribution */
998	<	add_contrib(matname, (float *)cp);
998	>	memcpy(rparams, cp, sizeof(float)*9);
999		cp += sizeof(float)9; n -= sizeof(float)9;
1000	+	add_contrib(modname);
1001		}
1002		done_contrib(); /* sum up contributions & output */
1003		lastdone = rtp->raynum;
1004	<	free(rtp->buf);
1005	<	/* catch up with unprocessed list */
1006	<	while (rt_unproc != NULL && rt_unproc->raynum == lastdone+1) {
1007	<	process_rays(rt_unproc);
703	<	rt_unproc = (rtu=rt_unproc)->next;
704	<	free(rtu);
705	<	}
706	<	} else { /* else insert in unprocessed list */
707	<	struct rtproc *rtl = NULL;
708	<	for (rtu = rt_unproc; rtu != NULL; rtu = (rtl=rtu)->next)
709	<	if (rtp->raynum < rtu->raynum)
710	<	break;
711	<	rtu = (struct rtproc *)malloc(sizeof(struct rtproc));
712	<	if (rtu == NULL)
713	<	error(SYSTEM, "out of memory in process_rays");
714	<	rtu = rtp;
715	<	if (rtl == NULL) {
716	<	rtu->next = rt_unproc;
717	<	rt_unproc = rtu;
718	<	} else {
719	<	rtu->next = rtl->next;
720	<	rtl->next = rtu;
721	<	}
1004	>	if (rtp->buf != NULL) /* free up buffer space */
1005	>	free(rtp->buf);
1006	>	rt_unproc = rtp->next;
1007	>	free(rtp); /* done with this ray tree */
1008		}
723	–	rtp->raynum = 0; /* clear path for next ray tree */
724	–	rtp->bsiz = 0;
725	–	rtp->buf = NULL;
1009		}
1010
1011		/* wait for rtrace process to finish with ray tree */
#	Line 763 \| Line 1046 \| wait_rproc(void)
1046		if (rt->buf == NULL) {
1047		rt->bsiz = treebufsiz;
1048		rt->buf = (char *)malloc(treebufsiz);
1049	<	} else if (rt->bpos + BUFSIZ > rt->buf + rt->bsiz) {
1049	>	} else if (rt->nbr + BUFSIZ > rt->bsiz) {
1050		if (rt->bsiz + BUFSIZ <= treebufsiz)
1051		rt->bsiz = treebufsiz;
1052		else
1053	<	rt->bsiz = treebufsiz += BUFSIZ;
1053	>	treebufsiz = rt->bsiz += BUFSIZ;
1054		rt->buf = (char *)realloc(rt->buf, rt->bsiz);
1055		}
1056		if (rt->buf == NULL)
1057		error(SYSTEM, "out of memory in wait_rproc");
1058	<	nr = read(rt->pd.r, rt->bpos,
1059	<	rt->buf + rt->bsiz - rt->bpos);
777	<	if (!nr)
1058	>	nr = read(rt->pd.r, rt->buf+rt->nbr, rt->bsiz-rt->nbr);
1059	>	if (nr <= 0)
1060		error(USER, "rtrace process died");
1061	<	rt->bpos += nr; /* advance buffer & check */
1062	<	if (rt->bpos[-1] == '\t' && rt->bpos[-2] == '-') {
1063	<	rt->bpos -= 2; /* elide terminator */
1064	<	process_rays(rt);
1061	>	rt->nbr += nr; /* advance & check */
1062	>	if (rt->nbr >= 4 && !memcmp(rt->buf+rt->nbr-4,
1063	>	"~\t~\t", 4)) {
1064	>	rt->nbr -= 4; /* elide terminator */
1065	>	queue_raytree(rt);
1066		rtfree = rt; /* ready for next ray */
1067		}
1068		}
#	Line 801 \| Line 1084 \| get_rproc(void)
1084
1085		/* trace ray contributions (main loop) */
1086		void
1087	<	tracecontribs(FILE *fin)
1087	>	trace_contribs(FILE *fin)
1088		{
1089		char inpbuf[128];
1090		int iblen;
1091		struct rtproc *rtp;
1092		/* loop over input */
1093	<	while ((iblen = getinp(inpbuf, fin)) > 0) {
1094	<	if (lastray+1 < lastray) { /* counter rollover? */
1093	>	while ((iblen = getinp(inpbuf, fin)) >= 0) {
1094	>	if (!iblen \|\| /* need reset? */
1095	>	queue_length() > 10*nrtprocs() \|\|
1096	>	lastray+1 < lastray) {
1097		while (wait_rproc() != NULL)
1098	<	;
1099	<	lastdone = lastray = 0;
1098	>	process_queue();
1099	>	if (lastray+1 < lastray)
1100	>	lastdone = lastray = 0;
1101		}
1102		rtp = get_rproc(); /* get avail. rtrace process */
1103	<	rtp->raynum = ++lastray; /* assign this ray to it */
1104	<	writebuf(rtp->pd.w, inpbuf, iblen);
1105	<	if (!--raysleft)
1106	<	break; /* explicit EOF */
1103	>	rtp->raynum = ++lastray; /* assign ray */
1104	>	if (iblen) { /* trace ray if valid */
1105	>	writebuf(rtp->pd.w, inpbuf, iblen);
1106	>	} else { /* else bypass dummy ray */
1107	>	queue_raytree(rtp); /* empty tree */
1108	>	if ((yres <= 0) \| (waitflush > 1))
1109	>	waitflush = 1; /* flush after this */
1110	>	}
1111	>	process_queue(); /* catch up with results */
1112	>	if (raysleft && !--raysleft)
1113	>	break; /* preemptive EOI */
1114		}
1115		while (wait_rproc() != NULL) /* process outstanding rays */
1116	<	;
1116	>	process_queue();
1117	>	if (raysleft)
1118	>	error(USER, "unexpected EOF on input");
1119	>	lu_done(&ofiletab); /* close output files */
1120	>	}
1121	>
1122	>	/* seek on the given output file */
1123	>	static int
1124	>	myseeko(const LUENT e, void p)
1125	>	{
1126	>	STREAMOUT sop = (STREAMOUT )e->data;
1127	>	off_t nbytes = (off_t )p;
1128	>
1129	>	if (sop->reclen > 1)
1130	>	nbytes = nbytes * sop->reclen;
1131	>	if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) {
1132	>	sprintf(errmsg, "seek error on file '%s'", e->key);
1133	>	error(SYSTEM, errmsg);
1134	>	}
1135	>	}
1136	>
1137	>	/* recover output if possible */
1138	>	void
1139	>	recover_output(FILE *fin)
1140	>	{
1141	>	off_t lastout = -1;
1142	>	int outvsiz, recsiz;
1143	>	char *outvfmt;
1144	>	int i, j;
1145	>	MODCONT *mp;
1146	>	int ofl;
1147	>	char oname[1024];
1148	>	LUENT ment, oent;
1149	>	STREAMOUT sout;
1150	>	off_t nvals;
1151	>	int xr, yr;
1152	>
1153	>	switch (outfmt) {
1154	>	case 'a':
1155	>	error(USER, "cannot recover ASCII output");
1156	>	return;
1157	>	case 'f':
1158	>	outvsiz = sizeof(float)*3;
1159	>	outvfmt = "float";
1160	>	break;
1161	>	case 'd':
1162	>	outvsiz = sizeof(double)*3;
1163	>	outvfmt = "double";
1164	>	break;
1165	>	case 'c':
1166	>	outvsiz = sizeof(COLR);
1167	>	outvfmt = COLRFMT;
1168	>	break;
1169	>	default:
1170	>	error(INTERNAL, "botched output format");
1171	>	return;
1172	>	}
1173	>	/* check modifier outputs */
1174	>	for (i = 0; i < nmods; i++) {
1175	>	ment = lu_find(&modconttab,modname[i]);
1176	>	mp = (MODCONT *)ment->data;
1177	>	if (mp->outspec == NULL)
1178	>	error(USER, "cannot recover from stdout");
1179	>	if (mp->outspec[0] == '!')
1180	>	error(USER, "cannot recover from command");
1181	>	for (j = 0; ; j++) { /* check each bin's file */
1182	>	ofl = ofname(oname, mp->outspec, mp->modname, j);
1183	>	if (ofl < 0)
1184	>	error(USER, "bad output file specification");
1185	>	oent = lu_find(&ofiletab, oname);
1186	>	if (oent->data != NULL) {
1187	>	sout = (STREAMOUT )oent->data;
1188	>	} else {
1189	>	sout.reclen = CNT_UNKNOWN;
1190	>	sout.ofp = NULL;
1191	>	}
1192	>	if (sout.ofp != NULL) { /* already open? */
1193	>	if (ofl & OF_BIN)
1194	>	continue;
1195	>	break;
1196	>	}
1197	>	/* open output */
1198	>	sout.ofp = fopen(oname, "rb+");
1199	>	if (sout.ofp == NULL) {
1200	>	if (j)
1201	>	break; /* assume end of modifier */
1202	>	sprintf(errmsg, "missing recover file '%s'",
1203	>	oname);
1204	>	error(USER, errmsg);
1205	>	}
1206	>	nvals = lseek(fileno(sout.ofp), 0, SEEK_END);
1207	>	if (nvals <= 0) {
1208	>	lastout = 0; /* empty output, quit here */
1209	>	fclose(sout.ofp);
1210	>	break;
1211	>	}
1212	>	if (sout.reclen == CNT_UNKNOWN) {
1213	>	if (!(ofl & OF_BIN)) {
1214	>	sprintf(errmsg,
1215	>	"need -bn to recover file '%s'",
1216	>	oname);
1217	>	error(USER, errmsg);
1218	>	}
1219	>	recsiz = outvsiz;
1220	>	} else
1221	>	recsiz = outvsiz * sout.reclen;
1222	>
1223	>	lseek(fileno(sout.ofp), 0, SEEK_SET);
1224	>	if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) {
1225	>	sprintf(errmsg, "format mismatch for '%s'",
1226	>	oname);
1227	>	error(USER, errmsg);
1228	>	}
1229	>	if ((xres > 0) & (yres > 0) &&
1230	>	(!fscnresolu(&xr, &yr, sout.ofp) \|\|
1231	>	xr != xres \|\|
1232	>	yr != yres)) {
1233	>	sprintf(errmsg, "resolution mismatch for '%s'",
1234	>	oname);
1235	>	error(USER, errmsg);
1236	>	}
1237	>	nvals = (nvals - (off_t)ftell(sout.ofp)) / recsiz;
1238	>	if ((lastout < 0) \| (nvals < lastout))
1239	>	lastout = nvals;
1240	>	if (oent->key == NULL) /* new entry */
1241	>	oent->key = strcpy((char *)
1242	>	malloc(strlen(oname)+1), oname);
1243	>	if (oent->data == NULL)
1244	>	oent->data = (char *)malloc(sizeof(STREAMOUT));
1245	>	(STREAMOUT )oent->data = sout;
1246	>	if (!(ofl & OF_BIN))
1247	>	break; /* no bin separation */
1248	>	}
1249	>	if (!lastout) { /* empty output */
1250	>	error(WARNING, "no previous data to recover");
1251	>	lu_done(&ofiletab); /* reclose all outputs */
1252	>	return;
1253	>	}
1254	>	if (j > mp->nbins) /* reallocate modifier bins */
1255	>	ment->data = (char *)(mp = growmodifier(mp, j));
1256	>	}
1257	>	if (lastout < 0) {
1258	>	error(WARNING, "no output files to recover");
1259	>	return;
1260	>	}
1261	>	if (raysleft && lastout >= raysleft) {
1262	>	error(WARNING, "output appears to be complete");
1263	>	/* XXX should read & discard input? */
1264	>	quit(0);
1265	>	}
1266	>	/* seek on all files */
1267	>	nvals = lastout * outvsiz;
1268	>	lu_doall(&ofiletab, myseeko, &nvals);
1269	>	/* skip repeated input */
1270	>	for (nvals = 0; nvals < lastout; nvals++)
1271	>	if (getinp(oname, fin) < 0)
1272	>	error(USER, "unexpected EOF on input");
1273	>	lastray = lastdone = (unsigned long)lastout;
1274	>	if (raysleft)
1275	>	raysleft -= lastray;
1276		}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/util/rtcontrib.c (file contents): Revision 1.1 by greg, Wed May 25 04:45:22 2005 UTC vs. Revision 1.40 by greg, Sun Feb 5 22:22:21 2006 UTC

Diff Legend

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.1 by greg, Wed May 25 04:45:22 2005 UTC vs.
Revision 1.40 by greg, Sun Feb 5 22:22:21 2006 UTC