ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rtcontrib.c

Comparing ray/src/util/rtcontrib.c (file contents):
Revision 1.34 by greg, Tue Oct 11 04:27:41 2005 UTC vs.
Revision 1.68 by greg, Thu Apr 12 01:56:07 2012 UTC

#	Line 5 | Line 5 | static const char RCSid[] = "$Id$";
5		* Gather rtrace output to compute contributions from particular sources
6		*/
7
8	+	/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
9	+	Need to refactor code by forking a subprocess for each
10	+	rtrace call to take output and accumulate it into bins
11	+	for the parent process.  This will avoid our current
12	+	bottleneck around processing output queues.  We'll sum into
13	+	bins and avoid the associated buffer growth, which can be crazy
14	+	now (gigabytes/subprocess).  Each child process will return
15	+	a ray number and a fully computed and ready-to-output
16	+	record of modifiers and their bin totals.  These will
17	+	be queued and sorted by the parent for ordered output or
18	+	accumulated for all rays if -c 0 is in play.
19	+	XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
20	+
21		#include  "standard.h"
22		#include  <ctype.h>
23		#include  <signal.h>
#	Line 16 | Line 29 | static const char RCSid[] = "$Id$";
29		#include  "lookup.h"
30		#include  "calcomp.h"
31
32	+	#ifdef _WIN32
33	+	typedef int     ssize_t;
34	+	#endif
35	+
36		#ifndef MAXMODLIST
37		#define MAXMODLIST      1024            /* maximum modifiers we'll track */
38		#endif
39
40	<	int     treebufsiz = BUFSIZ;            /* current tree buffer size */
40	>	#ifndef RNUMBER
41	>	#define RNUMBER         unsigned long   /* ray counter (>= sizeof pointer) */
42	>	#endif
43
44	+	ssize_t treebufsiz = BUFSIZ;            /* current tree buffer size */
45	+
46		typedef double  DCOLOR[3];              /* double-precision color */
47
48		/*
49		* The MODCONT structure is used to accumulate ray contributions
50		* for a particular modifier, which may be subdivided into bins
51	<	* if binv is non-zero.  If outspec contains a %s in it, this will
51	>	* if binv evaluates > 0.  If outspec contains a %s in it, this will
52		* be replaced with the modifier name.  If outspec contains a %d in it,
53		* this will be used to create one output file per bin, otherwise all bins
54		* will be written to the same file, in order.  If the global outfmt
#	Line 46 | Line 67 | static void mcfree(void *p) { epfree((*(MODCONT *)p).b
67
68		LUTAB   modconttab = LU_SINIT(NULL,mcfree);     /* modifier lookup table */
69
49	–	#define CNT_UNKNOWN     0               /* unknown record length */
50	–	#define CNT_PIPE        (-1)            /* output to a pipe */
70		/*
71		* The STREAMOUT structure holds an open FILE pointer and a count of
72	<	* the number of RGB triplets per record, or CNT_UNKNOWN (0) if
54	<	* unknown or CNT_PIPE (-1) if writing to a command.
72	>	* the number of RGB triplets per record, or 0 if unknown.
73		*/
74		typedef struct {
75		FILE            *ofp;           /* output file pointer */
76	+	int             outpipe;        /* output is to a pipe */
77		int             reclen;         /* triplets/record */
78	+	int             xr, yr;         /* output resolution for picture */
79		} STREAMOUT;
80
81		/* close output stream and free record */
#	Line 64 | Line 84 | closestream(void *p)
84		{
85		STREAMOUT       *sop = (STREAMOUT *)p;
86		int             status;
87	<	if (sop->reclen == CNT_PIPE)
87	>	if (sop->outpipe)
88		status = pclose(sop->ofp);
89		else
90		status = fclose(sop->ofp);
#	Line 81 | Line 101 | LUTAB  ofiletab = LU_SINIT(free,closestream);  /* output
101		STREAMOUT *getostream(const char *ospec, const char *mname, int bn, int noopen);
102		int ofname(char *oname, const char *ospec, const char *mname, int bn);
103		void printheader(FILE *fout, const char *info);
104	<	void printresolu(FILE *fout);
104	>	void printresolu(FILE *fout, int xr, int yr);
105
106		/*
107		* The rcont structure is used to manage i/o with a particular
#	Line 92 | Line 112 | void printresolu(FILE *fout);
112		struct rtproc {
113		struct rtproc   *next;          /* next in list of processes */
114		SUBPROC         pd;             /* rtrace pipe descriptors */
115	<	unsigned long   raynum;         /* ray number for this tree */
116	<	int             bsiz;           /* ray tree buffer length */
115	>	RNUMBER         raynum;         /* ray number for this tree */
116	>	size_t          bsiz;           /* ray tree buffer length */
117		char            *buf;           /* ray tree buffer */
118	<	int             nbr;            /* number of bytes from rtrace */
118	>	size_t          nbr;            /* number of bytes from rtrace */
119		};                              /* rtrace process buffer */
120
121		/* rtrace command and defaults */
122		char            *rtargv[256+2*MAXMODLIST] = { "rtrace",
123	<	"-dj", ".5", "-dr", "3",
124	<	"-ab", "1", "-ad", "128", };
123	>	"-dj", ".9", "-dr", "3",
124	>	"-ab", "1", "-ad", "350", };
125	>
126		int  rtargc = 9;
127		/* overriding rtrace options */
128	<	char            *myrtopts[] = { "-o~~TmWdp", "-h-", "-x", "1", "-y", "0",
128	>	char            *myrtopts[] = { "-h-", "-x", "1", "-y", "0",
129		"-dt", "0", "-as", "0", "-aa", "0", NULL };
130
131	+	#define RTCOEFF         "-o~~~TmWdp"    /* compute coefficients only */
132	+	#define RTCONTRIB       "-o~~~TmVdp"    /* compute ray contributions */
133	+
134		struct rtproc   rt0;                    /* head of rtrace process list */
135
136		struct rtproc   *rt_unproc = NULL;      /* unprocessed ray trees */
137
138	<	char    persistfn[] = "pfXXXXXX";       /* persist file name */
138	>	#define PERSIST_NONE    0               /* no persist file */
139	>	#define PERSIST_SINGLE  1               /* user set -P persist */
140	>	#define PERSIST_PARALL  2               /* user set -PP persist */
141	>	#define PERSIST_OURS    3               /* -PP persist belongs to us */
142	>	int     persist_state = PERSIST_NONE;   /* persist file state */
143	>	char    persistfn[] = "pfXXXXXX";       /* our persist file name, if set */
144
145		int             gargc;                  /* global argc */
146		char            **gargv;                /* global argv */
#	Line 123 | Line 152 | int            inpfmt = 'a';           /* input format */
152		int             outfmt = 'a';           /* output format */
153
154		int             header = 1;             /* output header? */
155	+	int             force_open = 0;         /* truncate existing output? */
156	+	int             recover = 0;            /* recover previous output? */
157	+	int             accumulate = 1;         /* input rays per output record */
158		int             xres = 0;               /* horiz. output resolution */
159		int             yres = 0;               /* vert. output resolution */
160
161	<	unsigned long   raysleft;               /* number of rays left to trace */
161	>	int             account;                /* current accumulation count */
162	>	RNUMBER         raysleft;               /* number of rays left to trace */
163		long            waitflush;              /* how long until next flush */
164
165	<	unsigned long   lastray = 0;            /* last ray number sent */
166	<	unsigned long   lastdone = 0;           /* last ray processed */
165	>	RNUMBER         lastray = 0;            /* last ray number sent */
166	>	RNUMBER         lastdone = 0;           /* last ray processed */
167
168		int             using_stdout = 0;       /* are we using stdout? */
169
#	Line 145 | Line 178 | void addmodfile(char *fname, char *outf, char *binv, i
178
179		void init(int np);
180		int done_rprocs(struct rtproc *rtp);
181	+	void reload_output(void);
182		void recover_output(FILE *fin);
183		void trace_contribs(FILE *fin);
184		struct rtproc *wait_rproc(void);
#	Line 154 | Line 188 | void process_queue(void);
188
189		void put_contrib(const DCOLOR cnt, FILE *fout);
190		void add_contrib(const char *modn);
191	<	void done_contrib(void);
191	>	void done_contrib(int navg);
192
193	+	#ifdef getc_unlocked                    /* avoid nasty overheads */
194	+	#undef getc
195	+	#define getc    getc_unlocked
196	+	#undef putc
197	+	#define putc    putc_unlocked
198	+	#undef ferror
199	+	#define ferror  ferror_unlocked
200	+	static int
201	+	fread_unl(void *ptr, int size, int nitems, FILE *fp)
202	+	{
203	+	char    *p = (char *)ptr;
204	+	int     len = size*nitems;
205	+	while (len-- > 0) {
206	+	int     c = getc_unlocked(fp);
207	+	if (c == EOF)
208	+	return((p - (char *)ptr)/size);
209	+	*p++ = c;
210	+	}
211	+	return(nitems);
212	+	}
213	+	#undef fread
214	+	#define fread   fread_unl
215	+	static int
216	+	fwrite_unl(const void *ptr, int size, int nitems, FILE *fp)
217	+	{
218	+	const char      *p = (const char *)ptr;
219	+	int             len = size*nitems;
220	+	while (len-- > 0)
221	+	putc_unlocked(*p++, fp);
222	+	if (ferror_unlocked(fp))
223	+	return(0);
224	+	return(nitems);
225	+	}
226	+	#undef fwrite
227	+	#define fwrite  fwrite_unl
228	+	#endif
229	+
230		/* return number of open rtrace processes */
231		static int
232		nrtprocs(void)
#	Line 207 | Line 278 | fmterr:
278		int
279		main(int argc, char *argv[])
280		{
281	+	int     contrib = 0;
282		int     nprocs = 1;
211	–	int     recover = 0;
283		char    *curout = NULL;
284		char    *binval = NULL;
285		int     bincnt = 0;
#	Line 217 | Line 288 | main(int argc, char *argv[])
288		/* need at least one argument */
289		if (argc < 2) {
290		fprintf(stderr,
291	<	"Usage: %s [-n nprocs][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n",
291	>	"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n",
292		argv[0]);
293		exit(1);
294		}
#	Line 233 | Line 304 | main(int argc, char *argv[])
304		while ((j = expandarg(&argc, &argv, i)) > 0)
305		;
306		if (j < 0) {
307	<	fprintf(stderr, "%s: cannot expand '%s'",
307	>	fprintf(stderr, "%s: cannot expand '%s'\n",
308		argv[0], argv[i]);
309		exit(1);
310		}
311		if (argv[i][0] == '-')
312		switch (argv[i][1]) {
242	–	case 'r':               /* recover output */
243	–	if (argv[i][2]) break;
244	–	recover++;
245	–	continue;
313		case 'n':               /* number of processes */
314		if (argv[i][2] || i >= argc-2) break;
315		nprocs = atoi(argv[++i]);
316		if (nprocs <= 0)
317		error(USER, "illegal number of processes");
318		continue;
319	+	case 'V':               /* output contributions */
320	+	switch (argv[i][2]) {
321	+	case '\0':
322	+	contrib = !contrib;
323	+	continue;
324	+	case '+': case '1':
325	+	case 'T': case 't':
326	+	case 'Y': case 'y':
327	+	contrib = 1;
328	+	continue;
329	+	case '-': case '0':
330	+	case 'F': case 'f':
331	+	case 'N': case 'n':
332	+	contrib = 0;
333	+	continue;
334	+	}
335	+	break;
336	+	case 'c':               /* input rays per output */
337	+	if (argv[i][2] || i >= argc-2) break;
338	+	accumulate = atoi(argv[++i]);
339	+	continue;
340	+	case 'r':               /* recover output */
341	+	if (argv[i][2]) break;
342	+	recover = 1;
343	+	continue;
344		case 'h':               /* output header? */
345		switch (argv[i][2]) {
346		case '\0':
#	Line 266 | Line 358 | main(int argc, char *argv[])
358		continue;
359		}
360		break;
361	<	case 'f':               /* file or i/o format */
361	>	case 'f':               /* file or force or format */
362		if (!argv[i][2]) {
363		char    *fpath;
364		if (i >= argc-2) break;
#	Line 281 | Line 373 | main(int argc, char *argv[])
373		fcompile(fpath);
374		continue;
375		}
376	+	if (argv[i][2] == 'o') {
377	+	force_open = 1;
378	+	continue;
379	+	}
380		setformat(argv[i]+2);
381		continue;
382		case 'e':               /* expression */
#	Line 302 | Line 398 | main(int argc, char *argv[])
398		case 'b':               /* bin expression/count */
399		if (i >= argc-2) break;
400		if (argv[i][2] == 'n') {
401	<	bincnt = atoi(argv[++i]);
401	>	bincnt = (int)(eval(argv[++i]) + .5);
402		continue;
403		}
404		if (argv[i][2]) break;
#	Line 320 | Line 416 | main(int argc, char *argv[])
416		rtargv[rtargc++] = argv[++i];
417		addmodfile(argv[i], curout, binval, bincnt);
418		continue;
419	+	case 'P':               /* persist file */
420	+	if (i >= argc-2) break;
421	+	persist_state = (argv[i][2] == 'P') ?
422	+	PERSIST_PARALL : PERSIST_SINGLE;
423	+	rtargv[rtargc++] = argv[i];
424	+	rtargv[rtargc++] = argv[++i];
425	+	continue;
426		}
427		rtargv[rtargc++] = argv[i];     /* assume rtrace option */
428		}
429	+	if (accumulate <= 0)    /* no output flushing for single record */
430	+	xres = yres = 0;
431		/* set global argument list */
432		gargc = argc; gargv = argv;
433		/* add "mandatory" rtrace settings */
434		for (j = 0; myrtopts[j] != NULL; j++)
435		rtargv[rtargc++] = myrtopts[j];
436	+	rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF;
437		/* just asking for defaults? */
438		if (!strcmp(argv[i], "-defaults")) {
439	<	char    sxres[16], syres[16];
439	>	char    nps[8], sxres[16], syres[16];
440		char    *rtpath;
441	<	printf("-n  %-2d\t\t\t\t# number of processes\n", nprocs);
441	>	printf("-c %-5d\t\t\t# accumulated rays per record\n",
442	>	accumulate);
443	>	printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
444	>	contrib ? "contributions" : "coefficients");
445		fflush(stdout);                 /* report OUR options */
446	+	rtargv[rtargc++] = "-n";
447	+	sprintf(nps, "%d", nprocs);
448	+	rtargv[rtargc++] = nps;
449		rtargv[rtargc++] = header ? "-h+" : "-h-";
450		sprintf(fmt, "-f%c%c", inpfmt, outfmt);
451		rtargv[rtargc++] = fmt;
#	Line 343 | Line 455 | main(int argc, char *argv[])
455		rtargv[rtargc++] = "-y";
456		sprintf(syres, "%d", yres);
457		rtargv[rtargc++] = syres;
346	–	rtargv[rtargc++] = "-oTW";
458		rtargv[rtargc++] = "-defaults";
459		rtargv[rtargc] = NULL;
460		rtpath = getpath(rtargv[0], getenv("PATH"), X_OK);
#	Line 357 | Line 468 | main(int argc, char *argv[])
468		exit(1);
469		}
470		if (nprocs > 1) {       /* add persist file if parallel */
471	<	rtargv[rtargc++] = "-PP";
472	<	rtargv[rtargc++] = mktemp(persistfn);
471	>	if (persist_state == PERSIST_SINGLE)
472	>	error(USER, "use -PP option for multiple processes");
473	>	if (persist_state == PERSIST_NONE) {
474	>	rtargv[rtargc++] = "-PP";
475	>	rtargv[rtargc++] = mktemp(persistfn);
476	>	persist_state = PERSIST_OURS;
477	>	}
478		}
479		/* add format string */
480		sprintf(fmt, "-f%cf", inpfmt);
#	Line 368 | Line 484 | main(int argc, char *argv[])
484		error(USER, "missing octree argument");
485		rtargv[rtargc++] = octree = argv[i];
486		rtargv[rtargc] = NULL;
487	<	/* start rtrace */
487	>	/* start rtrace & recover if requested */
488		init(nprocs);
489	<	if (recover)            /* perform recovery if requested */
490	<	recover_output(stdin);
491	<	trace_contribs(stdin);  /* compute contributions */
489	>	/* compute contributions */
490	>	trace_contribs(stdin);
491	>	/* clean up */
492		quit(0);
493		}
494
#	Line 418 | Line 534 | quit(int status)
534		{
535		int     rtstat;
536
537	<	if (rt0.next != NULL)           /* terminate persistent rtrace */
537	>	if (persist_state == PERSIST_OURS)  /* terminate waiting rtrace */
538		killpersist();
539		/* clean up rtrace process(es) */
540		rtstat = done_rprocs(&rt0);
#	Line 480 | Line 596 | init(int np)
596		rtp->next = NULL;               /* terminate list */
597		if (yres > 0) {
598		if (xres > 0)
599	<	raysleft = (unsigned long)xres*yres;
599	>	raysleft = (RNUMBER)xres*yres;
600		else
601		raysleft = yres;
602		} else
603		raysleft = 0;
604	<	waitflush = xres;
604	>	if ((account = accumulate) > 0)
605	>	raysleft *= accumulate;
606	>	waitflush = (yres > 0) & (xres > 1) ? 0 : xres;
607	>	if (!recover)
608	>	return;
609	>	/* recover previous values */
610	>	if (accumulate <= 0)
611	>	reload_output();
612	>	else
613	>	recover_output(stdin);
614		}
615
616		/* grow modifier to accommodate more bins */
#	Line 515 | Line 640 | addmodifier(char *modn, char *outf, char *binv, int bi
640		error(USER, errmsg);
641		}
642		if (nmods >= MAXMODLIST)
643	<	error(USER, "too many modifiers");
643	>	error(INTERNAL, "too many modifiers");
644		modname[nmods++] = modn;        /* XXX assumes static string */
645		lep->key = modn;                /* XXX assumes static string */
646		mp = (MODCONT *)malloc(sizeof(MODCONT));
#	Line 523 | Line 648 | addmodifier(char *modn, char *outf, char *binv, int bi
648		error(SYSTEM, "out of memory in addmodifier");
649		mp->outspec = outf;             /* XXX assumes static string */
650		mp->modname = modn;             /* XXX assumes static string */
651	<	if (binv != NULL)
652	<	mp->binv = eparse(binv);
653	<	else
654	<	mp->binv = eparse("0");
655	<	mp->nbins = 1;
651	>	if (binv == NULL)
652	>	binv = "0";             /* use single bin if unspecified */
653	>	mp->binv = eparse(binv);
654	>	if (mp->binv->type == NUM) {    /* check value if constant */
655	>	bincnt = (int)(evalue(mp->binv) + 1.5);
656	>	if (bincnt != 1) {
657	>	sprintf(errmsg, "illegal non-zero constant for bin (%s)",
658	>	binv);
659	>	error(USER, errmsg);
660	>	}
661	>	}
662	>	mp->nbins = 1;                  /* initialize results holder */
663		setcolor(mp->cbin[0], 0., 0., 0.);
664	<	if (mp->binv->type == NUM)      /* assume one bin if constant */
533	<	bincnt = 1;
534	<	else if (bincnt > 1)
664	>	if (bincnt > 1)
665		mp = growmodifier(mp, bincnt);
666		lep->data = (char *)mp;
667		/* allocate output streams */
668	<	for (i = outf==NULL || outf[0]=='!' ? 0 : bincnt; i--; )
668	>	for (i = bincnt; i-- > 0; )
669		getostream(mp->outspec, mp->modname, i, 1);
670		return mp;
671		}
#	Line 594 | Line 724 | ofname(char *oname, const char *ospec, const char *mna
724		mnp = cp;
725		break;
726		case 'd':
727	+	case 'i':
728	+	case 'o':
729	+	case 'x':
730	+	case 'X':
731		if (bnp != NULL)
732		return -1;
733		bnp = cp;
#	Line 626 | Line 760 | void
760		printheader(FILE *fout, const char *info)
761		{
762		extern char     VersionID[];
763	<	FILE            *fin = fopen(octree, "r");
764	<
765	<	if (fin == NULL)
766	<	quit(1);
767	<	checkheader(fin, "ignore", fout);       /* copy octree header */
768	<	fclose(fin);
763	>	/* copy octree header */
764	>	if (octree[0] == '!') {
765	>	newheader("RADIANCE", fout);
766	>	fputs(octree+1, fout);
767	>	if (octree[strlen(octree)-1] != '\n')
768	>	fputc('\n', fout);
769	>	} else {
770	>	FILE    *fin = fopen(octree, "r");
771	>	if (fin == NULL)
772	>	quit(1);
773	>	checkheader(fin, "ignore", fout);
774	>	fclose(fin);
775	>	}
776		printargs(gargc-1, gargv, fout);        /* add our command */
777		fprintf(fout, "SOFTWARE= %s\n", VersionID);
778		fputnow(fout);
#	Line 656 | Line 797 | printheader(FILE *fout, const char *info)
797
798		/* write resolution string to given output stream */
799		void
800	<	printresolu(FILE *fout)
800	>	printresolu(FILE *fout, int xr, int yr)
801		{
802	<	if (xres > 0) {
803	<	if (yres > 0)                   /* resolution string */
663	<	fprtresolu(xres, yres, fout);
664	<	fflush(fout);
665	<	}
802	>	if ((xr > 0) & (yr > 0))        /* resolution string */
803	>	fprtresolu(xr, yr, fout);
804		}
805
806		/* Get output stream pointer (open and write header if new and noopen==0) */
807		STREAMOUT *
808		getostream(const char *ospec, const char *mname, int bn, int noopen)
809		{
810	+	static const DCOLOR     nocontrib = BLKCOLOR;
811		static STREAMOUT        stdos;
812		int                     ofl;
813		char                    oname[1024];
#	Line 677 | Line 816 | getostream(const char *ospec, const char *mname, int b
816
817		if (ospec == NULL) {                    /* use stdout? */
818		if (!noopen && !using_stdout) {
680	–	stdos.reclen = 0;
819		if (outfmt != 'a')
820		SET_FILE_BINARY(stdout);
821		if (header)
822		printheader(stdout, NULL);
823	<	printresolu(stdout);
823	>	printresolu(stdout, xres, yres);
824	>	if (waitflush > 0)
825	>	fflush(stdout);
826	>	stdos.xr = xres; stdos.yr = yres;
827		using_stdout = 1;
828		}
829		stdos.ofp = stdout;
#	Line 702 | Line 843 | getostream(const char *ospec, const char *mname, int b
843		sop = (STREAMOUT *)malloc(sizeof(STREAMOUT));
844		if (sop == NULL)
845		error(SYSTEM, "out of memory in getostream");
846	<	sop->reclen = oname[0] == '!' ? CNT_PIPE : CNT_UNKNOWN;
846	>	sop->outpipe = oname[0] == '!';
847	>	sop->reclen = 0;
848		sop->ofp = NULL;                /* open iff noopen==0 */
849	+	sop->xr = xres; sop->yr = yres;
850		lep->data = (char *)sop;
851	+	if (!sop->outpipe & !force_open & !recover &&
852	+	access(oname, F_OK) == 0) {
853	+	errno = EEXIST;         /* file exists */
854	+	goto openerr;
855	+	}
856		}
857		if (!noopen && sop->ofp == NULL) {      /* open output stream */
858		long            i;
859		if (oname[0] == '!')            /* output to command */
860		sop->ofp = popen(oname+1, "w");
861	<	else
861	>	else                            /* else open file */
862		sop->ofp = fopen(oname, "w");
863	<	if (sop->ofp == NULL) {
864	<	sprintf(errmsg, "cannot open '%s' for writing", oname);
717	<	error(SYSTEM, errmsg);
718	<	}
863	>	if (sop->ofp == NULL)
864	>	goto openerr;
865		if (outfmt != 'a')
866		SET_FILE_BINARY(sop->ofp);
867	+	#ifdef getc_unlocked                            /* avoid lock/unlock overhead */
868	+	flockfile(sop->ofp);
869	+	#endif
870		if (header) {
871		char    info[512];
872		char    *cp = info;
#	Line 732 | Line 881 | getostream(const char *ospec, const char *mname, int b
881		*cp = '\0';
882		printheader(sop->ofp, info);
883		}
884	<	printresolu(sop->ofp);
884	>	if (accumulate > 0) {           /* global resolution */
885	>	sop->xr = xres; sop->yr = yres;
886	>	}
887	>	printresolu(sop->ofp, sop->xr, sop->yr);
888		/* play catch-up */
889	<	for (i = sop->reclen > 1 ? sop->reclen*lastdone : lastdone;
890	<	i--; ) {
891	<	static const DCOLOR     nocontrib = BLKCOLOR;
892	<	put_contrib(nocontrib, sop->ofp);
889	>	for (i = accumulate > 0 ? lastdone/accumulate : 0; i--; ) {
890	>	int     j = sop->reclen;
891	>	if (j <= 0) j = 1;
892	>	while (j--)
893	>	put_contrib(nocontrib, sop->ofp);
894		if (outfmt == 'a')
895		putc('\n', sop->ofp);
896		}
897	<	if (xres > 0)
897	>	if (waitflush > 0)
898		fflush(sop->ofp);
899		}
900	<	if (sop->reclen != CNT_PIPE)            /* add to length if noopen */
901	<	sop->reclen += noopen;
902	<	return sop;                             /* return open stream */
900	>	sop->reclen += noopen;                  /* add to length if noopen */
901	>	return sop;                             /* return output stream */
902	>	openerr:
903	>	sprintf(errmsg, "cannot open '%s' for writing", oname);
904	>	error(SYSTEM, errmsg);
905	>	return NULL;    /* pro forma return */
906		}
907
908		/* read input ray into buffer */
909		int
910		getinp(char *buf, FILE *fp)
911		{
912	+	double  dv[3], *dvp;
913	+	float   *fvp;
914		char    *cp;
915		int     i;
916
#	Line 761 | Line 919 | getinp(char *buf, FILE *fp)
919		cp = buf;               /* make sure we get 6 floats */
920		for (i = 0; i < 6; i++) {
921		if (fgetword(cp, buf+127-cp, fp) == NULL)
922	<	return 0;
922	>	return -1;
923	>	if (i >= 3)
924	>	dv[i-3] = atof(cp);
925		if ((cp = fskip(cp)) == NULL || *cp)
926	<	return 0;
926	>	return -1;
927		*cp++ = ' ';
928		}
929		getc(fp);               /* get/put eol */
930		*cp-- = '\0'; *cp = '\n';
931	+	if (DOT(dv,dv) <= FTINY*FTINY)
932	+	return 0;       /* dummy ray */
933		return strlen(buf);
934		case 'f':
935	<	if (fread(buf, sizeof(float), 6, fp) < 6)
936	<	return 0;
935	>	if (fread(buf, sizeof(float), 6, fp) != 6)
936	>	return -1;
937	>	fvp = (float *)buf + 3;
938	>	if (DOT(fvp,fvp) <= FTINY*FTINY)
939	>	return 0;       /* dummy ray */
940		return sizeof(float)*6;
941		case 'd':
942	<	if (fread(buf, sizeof(double), 6, fp) < 6)
943	<	return 0;
942	>	if (fread(buf, sizeof(double), 6, fp) != 6)
943	>	return -1;
944	>	dvp = (double *)buf + 3;
945	>	if (DOT(dvp,dvp) <= FTINY*FTINY)
946	>	return 0;       /* dummy ray */
947		return sizeof(double)*6;
948		}
949		error(INTERNAL, "botched input format");
950	<	return 0;       /* pro forma return */
950	>	return -1;      /* pro forma return */
951		}
952
953		static float    rparams[9];             /* traced ray parameters */
#	Line 843 | Line 1011 | put_contrib(const DCOLOR cnt, FILE *fout)
1011		fprintf(fout, "%.6e\t%.6e\t%.6e\t", cnt[0], cnt[1], cnt[2]);
1012		break;
1013		case 'f':
1014	<	fv[0] = cnt[0];
847	<	fv[1] = cnt[1];
848	<	fv[2] = cnt[2];
1014	>	copycolor(fv, cnt);
1015		fwrite(fv, sizeof(float), 3, fout);
1016		break;
1017		case 'd':
#	Line 860 | Line 1026 | put_contrib(const DCOLOR cnt, FILE *fout)
1026		}
1027		}
1028
1029	<	/* output ray tallies and clear for next primary */
1029	>	/* output ray tallies and clear for next accumulation */
1030		void
1031	<	done_contrib(void)
1031	>	done_contrib(int navg)
1032		{
1033	+	double          sf = 1.;
1034		int             i, j;
1035		MODCONT         *mp;
1036		STREAMOUT       *sop;
1037	+	/* set average scaling */
1038	+	if (navg > 1)
1039	+	sf = 1. / (double)navg;
1040		/* output modifiers in order */
1041		for (i = 0; i < nmods; i++) {
1042		mp = (MODCONT *)lu_find(&modconttab,modname[i])->data;
1043	+	if (navg > 1)                   /* average scaling */
1044	+	for (j = mp->nbins; j--; )
1045	+	scalecolor(mp->cbin[j], sf);
1046		sop = getostream(mp->outspec, mp->modname, 0,0);
1047		put_contrib(mp->cbin[0], sop->ofp);
1048		if (mp->nbins > 3 &&            /* minor optimization */
#	Line 880 | Line 1053 | done_contrib(void)
1053		for (j = 1; j < mp->nbins; j++)
1054		put_contrib(mp->cbin[j],
1055		getostream(mp->outspec,mp->modname,j,0)->ofp);
1056	<	/* clear for next ray tree */
1056	>	/* clear for next time */
1057		memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins);
1058		}
1059		--waitflush;                            /* terminate records */
#	Line 888 | Line 1061 | done_contrib(void)
1061		if (using_stdout & (outfmt == 'a'))
1062		putc('\n', stdout);
1063		if (!waitflush) {
1064	<	waitflush = xres;
1064	>	waitflush = (yres > 0) & (xres > 1) ? 0 : xres;
1065		if (using_stdout)
1066		fflush(stdout);
1067		}
#	Line 939 | Line 1112 | process_queue(void)
1112		if (!n || !(isalpha(*cp) | (*cp == '_')))
1113		error(USER, "bad modifier name from rtrace");
1114		/* get modifier name */
1115	<	while (n > 0 && *cp != '\t') {
1115	>	while (n > 1 && *cp != '\t') {
1116	>	if (mnp - modname >= sizeof(modname)-2)
1117	>	error(INTERNAL, "modifier name too long");
1118		*mnp++ = *cp++; n--;
1119		}
1120		*mnp = '\0';
#	Line 951 | Line 1126 | process_queue(void)
1126		cp += sizeof(float)*9; n -= sizeof(float)*9;
1127		add_contrib(modname);
1128		}
1129	<	done_contrib();         /* sum up contributions & output */
1129	>	/* time to produce record? */
1130	>	if (account > 0 && !--account)
1131	>	done_contrib(account = accumulate);
1132		lastdone = rtp->raynum;
1133	<	free(rtp->buf);         /* free up buffer space */
1133	>	if (rtp->buf != NULL)   /* free up buffer space */
1134	>	free(rtp->buf);
1135		rt_unproc = rtp->next;
1136		free(rtp);              /* done with this ray tree */
1137		}
#	Line 965 | Line 1143 | wait_rproc(void)
1143		{
1144		struct rtproc   *rtfree = NULL;
1145		fd_set          readset, errset;
1146	<	int             nr;
1146	>	ssize_t         nr;
1147		struct rtproc   *rt;
1148		int             n;
1149
#	Line 996 | Line 1174 | wait_rproc(void)
1174		continue;
1175		if (rt->buf == NULL) {
1176		rt->bsiz = treebufsiz;
1177	<	rt->buf = (char *)malloc(treebufsiz);
1177	>	rt->buf = (char *)malloc(rt->bsiz);
1178		} else if (rt->nbr + BUFSIZ > rt->bsiz) {
1179		if (rt->bsiz + BUFSIZ <= treebufsiz)
1180		rt->bsiz = treebufsiz;
1181	<	else
1182	<	treebufsiz = rt->bsiz += BUFSIZ;
1181	>	else if ((treebufsiz = rt->bsiz += BUFSIZ) < 0)
1182	>	error(INTERNAL,
1183	>	"ray buffer does not fit memory");
1184		rt->buf = (char *)realloc(rt->buf, rt->bsiz);
1185		}
1186		if (rt->buf == NULL)
1187		error(SYSTEM, "out of memory in wait_rproc");
1188	<	nr = read(rt->pd.r, rt->buf+rt->nbr, rt->bsiz-rt->nbr);
1189	<	if (nr <= 0)
1188	>	nr = rt->bsiz - rt->nbr;
1189	>	if (nr & ~0x7fffffff)   /* avoid 32-bit OS issues */
1190	>	nr = 0x7fffffff;
1191	>	nr = read(rt->pd.r, rt->buf+rt->nbr, nr);
1192	>	if (nr < 0)
1193	>	error(SYSTEM, "read error from rtrace");
1194	>	if (!nr)
1195		error(USER, "rtrace process died");
1196		rt->nbr += nr;          /* advance & check */
1197	<	if (rt->nbr >= 4 && !memcmp(rt->buf+rt->nbr-4,
1198	<	"~\t~\t", 4)) {
1199	<	rt->nbr -= 4;   /* elide terminator */
1197	>	if (rt->nbr >= 6 && !memcmp(rt->buf+rt->nbr-6,
1198	>	"~\t~\t~\t", 6)) {
1199	>	rt->nbr -= 6;   /* elide terminator */
1200		queue_raytree(rt);
1201		rtfree = rt;    /* ready for next ray */
1202		}
#	Line 1037 | Line 1221 | get_rproc(void)
1221		void
1222		trace_contribs(FILE *fin)
1223		{
1224	+	static int      ignore_warning_given = 0;
1225		char            inpbuf[128];
1226		int             iblen;
1227		struct rtproc   *rtp;
1228		/* loop over input */
1229	<	while ((iblen = getinp(inpbuf, fin)) > 0) {
1230	<	if (lastray+1 < lastray ||      /* need reset? */
1231	<	queue_length() > 10*nrtprocs()) {
1229	>	while ((iblen = getinp(inpbuf, fin)) >= 0) {
1230	>	if (!iblen && accumulate != 1) {
1231	>	if (!ignore_warning_given++)
1232	>	error(WARNING,
1233	>	"dummy ray(s) ignored during accumulation\n");
1234	>	continue;
1235	>	}
1236	>	if (!iblen ||                   /* need flush/reset? */
1237	>	queue_length() > 10*nrtprocs() ||
1238	>	lastray+1 < lastray) {
1239		while (wait_rproc() != NULL)
1240		process_queue();
1241	<	if (lastray+1 < lastray)
1050	<	lastdone = lastray = 0;
1241	>	lastdone = lastray = 0;
1242		}
1243		rtp = get_rproc();              /* get avail. rtrace process */
1244	<	rtp->raynum = ++lastray;        /* assign ray to it */
1245	<	writebuf(rtp->pd.w, inpbuf, iblen);
1246	<	if (raysleft && !--raysleft)
1247	<	break;
1244	>	rtp->raynum = ++lastray;        /* assign ray */
1245	>	if (iblen) {                    /* trace ray if valid */
1246	>	writebuf(rtp->pd.w, inpbuf, iblen);
1247	>	} else {                        /* else bypass dummy ray */
1248	>	queue_raytree(rtp);     /* queue empty ray/record */
1249	>	if ((yres <= 0) | (xres <= 0))
1250	>	waitflush = 1;  /* flush right after */
1251	>	}
1252		process_queue();                /* catch up with results */
1253	+	if (raysleft && !--raysleft)
1254	+	break;                  /* preemptive EOI */
1255		}
1256		while (wait_rproc() != NULL)            /* process outstanding rays */
1257		process_queue();
1258	+	if (accumulate <= 0)
1259	+	done_contrib(0);                /* output tallies */
1260	+	else if (account < accumulate) {
1261	+	error(WARNING, "partial accumulation in final record");
1262	+	done_contrib(accumulate - account);
1263	+	}
1264		if (raysleft)
1265		error(USER, "unexpected EOF on input");
1266		lu_done(&ofiletab);                     /* close output files */
1267		}
1268
1269	+	/* get ray contribution from previous file */
1270	+	static int
1271	+	get_contrib(DCOLOR cnt, FILE *finp)
1272	+	{
1273	+	COLOR   fv;
1274	+	COLR    cv;
1275	+
1276	+	switch (outfmt) {
1277	+	case 'a':
1278	+	return(fscanf(finp,"%lf %lf %lf",&cnt[0],&cnt[1],&cnt[2]) == 3);
1279	+	case 'f':
1280	+	if (fread(fv, sizeof(fv[0]), 3, finp) != 3)
1281	+	return(0);
1282	+	copycolor(cnt, fv);
1283	+	return(1);
1284	+	case 'd':
1285	+	return(fread(cnt, sizeof(cnt[0]), 3, finp) == 3);
1286	+	case 'c':
1287	+	if (fread(cv, sizeof(cv), 1, finp) != 1)
1288	+	return(0);
1289	+	colr_color(fv, cv);
1290	+	copycolor(cnt, fv);
1291	+	return(1);
1292	+	default:
1293	+	error(INTERNAL, "botched output format");
1294	+	}
1295	+	return(0);      /* pro forma return */
1296	+	}
1297	+
1298	+	/* close output file opened for input */
1299	+	static int
1300	+	myclose(const LUENT *e, void *p)
1301	+	{
1302	+	STREAMOUT       *sop = (STREAMOUT *)e->data;
1303	+
1304	+	if (sop->ofp == NULL)
1305	+	return(0);
1306	+	fclose(sop->ofp);
1307	+	sop->ofp = NULL;
1308	+	return(0);
1309	+	}
1310	+
1311	+	/* load previously accumulated values */
1312	+	void
1313	+	reload_output(void)
1314	+	{
1315	+	int             i, j;
1316	+	MODCONT         *mp;
1317	+	int             ofl;
1318	+	char            oname[1024];
1319	+	char            *fmode = "rb";
1320	+	char            *outvfmt;
1321	+	LUENT           *ment, *oent;
1322	+	int             xr, yr;
1323	+	STREAMOUT       sout;
1324	+	DCOLOR          rgbv;
1325	+
1326	+	switch (outfmt) {
1327	+	case 'a':
1328	+	outvfmt = "ascii";
1329	+	fmode = "r";
1330	+	break;
1331	+	case 'f':
1332	+	outvfmt = "float";
1333	+	break;
1334	+	case 'd':
1335	+	outvfmt = "double";
1336	+	break;
1337	+	case 'c':
1338	+	outvfmt = COLRFMT;
1339	+	break;
1340	+	default:
1341	+	error(INTERNAL, "botched output format");
1342	+	return;
1343	+	}
1344	+	/* reload modifier values */
1345	+	for (i = 0; i < nmods; i++) {
1346	+	ment = lu_find(&modconttab,modname[i]);
1347	+	mp = (MODCONT *)ment->data;
1348	+	if (mp->outspec == NULL)
1349	+	error(USER, "cannot reload from stdout");
1350	+	if (mp->outspec[0] == '!')
1351	+	error(USER, "cannot reload from command");
1352	+	for (j = 0; ; j++) {            /* load each modifier bin */
1353	+	ofl = ofname(oname, mp->outspec, mp->modname, j);
1354	+	if (ofl < 0)
1355	+	error(USER, "bad output file specification");
1356	+	oent = lu_find(&ofiletab, oname);
1357	+	if (oent->data != NULL) {
1358	+	sout = *(STREAMOUT *)oent->data;
1359	+	} else {
1360	+	sout.reclen = 0;
1361	+	sout.outpipe = 0;
1362	+	sout.xr = xres; sout.yr = yres;
1363	+	sout.ofp = NULL;
1364	+	}
1365	+	if (sout.ofp == NULL) { /* open output as input */
1366	+	sout.ofp = fopen(oname, fmode);
1367	+	if (sout.ofp == NULL) {
1368	+	if (j)
1369	+	break;  /* assume end of modifier */
1370	+	sprintf(errmsg, "missing reload file '%s'",
1371	+	oname);
1372	+	error(WARNING, errmsg);
1373	+	break;
1374	+	}
1375	+	#ifdef getc_unlocked                                    /* avoid lock/unlock overhead */
1376	+	flockfile(sout.ofp);
1377	+	#endif
1378	+	if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) {
1379	+	sprintf(errmsg, "format mismatch for '%s'",
1380	+	oname);
1381	+	error(USER, errmsg);
1382	+	}
1383	+	if ((sout.xr > 0) & (sout.yr > 0) &&
1384	+	(!fscnresolu(&xr, &yr, sout.ofp) ||
1385	+	(xr != sout.xr) |
1386	+	(yr != sout.yr))) {
1387	+	sprintf(errmsg, "resolution mismatch for '%s'",
1388	+	oname);
1389	+	error(USER, errmsg);
1390	+	}
1391	+	}
1392	+	/* read in RGB value */
1393	+	if (!get_contrib(rgbv, sout.ofp)) {
1394	+	if (!j) {
1395	+	fclose(sout.ofp);
1396	+	break;          /* ignore empty file */
1397	+	}
1398	+	if (j < mp->nbins) {
1399	+	sprintf(errmsg, "missing data in '%s'",
1400	+	oname);
1401	+	error(USER, errmsg);
1402	+	}
1403	+	break;
1404	+	}
1405	+	if (j >= mp->nbins)             /* grow modifier size */
1406	+	ment->data = (char *)(mp = growmodifier(mp, j+1));
1407	+	copycolor(mp->cbin[j], rgbv);
1408	+	if (oent->key == NULL)          /* new file entry */
1409	+	oent->key = strcpy((char *)
1410	+	malloc(strlen(oname)+1), oname);
1411	+	if (oent->data == NULL)
1412	+	oent->data = (char *)malloc(sizeof(STREAMOUT));
1413	+	*(STREAMOUT *)oent->data = sout;
1414	+	}
1415	+	}
1416	+	lu_doall(&ofiletab, myclose, NULL);     /* close all files */
1417	+	}
1418	+
1419		/* seek on the given output file */
1420		static int
1421		myseeko(const LUENT *e, void *p)
#	Line 1076 | Line 1429 | myseeko(const LUENT *e, void *p)
1429		sprintf(errmsg, "seek error on file '%s'", e->key);
1430		error(SYSTEM, errmsg);
1431		}
1432	+	return 0;
1433		}
1434
1435		/* recover output if possible */
#	Line 1130 | Line 1484 | recover_output(FILE *fin)
1484		if (oent->data != NULL) {
1485		sout = *(STREAMOUT *)oent->data;
1486		} else {
1487	<	sout.reclen = CNT_UNKNOWN;
1487	>	sout.reclen = 0;
1488	>	sout.outpipe = 0;
1489		sout.ofp = NULL;
1490		}
1491		if (sout.ofp != NULL) { /* already open? */
#	Line 1145 | Line 1500 | recover_output(FILE *fin)
1500		break;  /* assume end of modifier */
1501		sprintf(errmsg, "missing recover file '%s'",
1502		oname);
1503	<	error(USER, errmsg);
1503	>	error(WARNING, errmsg);
1504	>	break;
1505		}
1506		nvals = lseek(fileno(sout.ofp), 0, SEEK_END);
1507		if (nvals <= 0) {
#	Line 1153 | Line 1509 | recover_output(FILE *fin)
1509		fclose(sout.ofp);
1510		break;
1511		}
1512	<	if (sout.reclen == CNT_UNKNOWN) {
1512	>	if (!sout.reclen) {
1513		if (!(ofl & OF_BIN)) {
1514		sprintf(errmsg,
1515		"need -bn to recover file '%s'",
#	Line 1170 | Line 1526 | recover_output(FILE *fin)
1526		oname);
1527		error(USER, errmsg);
1528		}
1529	<	if ((xres > 0) & (yres > 0) &&
1529	>	sout.xr = xres; sout.yr = yres;
1530	>	if ((sout.xr > 0) & (sout.yr > 0) &&
1531		(!fscnresolu(&xr, &yr, sout.ofp) ||
1532	<	xr != xres ||
1533	<	yr != yres)) {
1532	>	(xr != sout.xr) |
1533	>	(yr != sout.yr))) {
1534		sprintf(errmsg, "resolution mismatch for '%s'",
1535		oname);
1536		error(USER, errmsg);
#	Line 1202 | Line 1559 | recover_output(FILE *fin)
1559		error(WARNING, "no output files to recover");
1560		return;
1561		}
1562	<	if (raysleft && lastout >= raysleft) {
1562	>	if (raysleft && lastout >= raysleft/accumulate) {
1563		error(WARNING, "output appears to be complete");
1564		/* XXX should read & discard input? */
1565		quit(0);
#	Line 1212 | Line 1569 | recover_output(FILE *fin)
1569		lu_doall(&ofiletab, myseeko, &nvals);
1570		/* skip repeated input */
1571		for (nvals = 0; nvals < lastout; nvals++)
1572	<	if (getinp(oname, fin) <= 0)
1572	>	if (getinp(oname, fin) < 0)
1573		error(USER, "unexpected EOF on input");
1574	<	lastray = lastdone = (unsigned long)lastout;
1574	>	lastray = lastdone = (RNUMBER)lastout * accumulate;
1575		if (raysleft)
1576		raysleft -= lastray;
1577		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)