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.11 by greg, Thu Jun 2 18:51:46 2005 UTC vs.
Revision 1.34 by greg, Tue Oct 11 04:27:41 2005 UTC

#	Line 16 | Line 16 | static const char RCSid[] = "$Id$";
16		#include  "lookup.h"
17		#include  "calcomp.h"
18
19	+	#ifndef MAXMODLIST
20		#define MAXMODLIST      1024            /* maximum modifiers we'll track */
21	+	#endif
22
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 44 | Line 46 | static void mcfree(void *p) { epfree((*(MODCONT *)p).b
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 67 | Line 99 | struct rtproc {
99		};                              /* rtrace process buffer */
100
101		/* rtrace command and defaults */
102	<	char            *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3",
103	<	"-ab", "1", "-ad", "128", "-lr", "-10", };
104	<	int  rtargc = 11;
102	>	char            *rtargv[256+2*MAXMODLIST] = { "rtrace",
103	>	"-dj", ".5", "-dr", "3",
104	>	"-ab", "1", "-ad", "128", };
105	>	int  rtargc = 9;
106		/* overriding rtrace options */
107		char            *myrtopts[] = { "-o~~TmWdp", "-h-", "-x", "1", "-y", "0",
108		"-dt", "0", "-as", "0", "-aa", "0", NULL };
#	Line 93 | Line 126 | int            header = 1;             /* output header? */
126		int             xres = 0;               /* horiz. output resolution */
127		int             yres = 0;               /* vert. output resolution */
128
129	<	long            raysleft;               /* number of rays left to trace */
129	>	unsigned long   raysleft;               /* number of rays left to trace */
130		long            waitflush;              /* how long until next flush */
131
132		unsigned long   lastray = 0;            /* last ray number sent */
#	Line 104 | Line 137 | int            using_stdout = 0;       /* are we using stdout? */
137		const char      *modname[MAXMODLIST];   /* ordered modifier name list */
138		int             nmods = 0;              /* number of modifiers */
139
140	<	MODCONT *addmodifier(char *modn, char *outf, char *binv);
140	>	#define queue_length()          (lastray - lastdone)
141
142	+	MODCONT *growmodifier(MODCONT *mp, int nb);
143	+	MODCONT *addmodifier(char *modn, char *outf, char *binv, int bincnt);
144	+	void addmodfile(char *fname, char *outf, char *binv, int bincnt);
145	+
146		void init(int np);
147		int done_rprocs(struct rtproc *rtp);
148	<	void trace_contribs(FILE *fp);
148	>	void recover_output(FILE *fin);
149	>	void trace_contribs(FILE *fin);
150		struct rtproc *wait_rproc(void);
151		struct rtproc *get_rproc(void);
152		void queue_raytree(struct rtproc *rtp);
153		void process_queue(void);
154
155	<	void putcontrib(const DCOLOR cnt, FILE *fout);
155	>	void put_contrib(const DCOLOR cnt, FILE *fout);
156		void add_contrib(const char *modn);
157		void done_contrib(void);
158
159	+	/* return number of open rtrace processes */
160	+	static int
161	+	nrtprocs(void)
162	+	{
163	+	int     nrtp = 0;
164	+	struct rtproc   *rtp;
165	+
166	+	for (rtp = &rt0; rtp != NULL; rtp = rtp->next)
167	+	nrtp += rtp->pd.running;
168	+	return(nrtp);
169	+	}
170	+
171		/* set input/output format */
172		static void
173		setformat(const char *fmt)
#	Line 158 | Line 208 | int
208		main(int argc, char *argv[])
209		{
210		int     nprocs = 1;
211	+	int     recover = 0;
212		char    *curout = NULL;
213		char    *binval = NULL;
214	+	int     bincnt = 0;
215		char    fmt[8];
216		int     i, j;
217	+	/* need at least one argument */
218	+	if (argc < 2) {
219	+	fprintf(stderr,
220	+	"Usage: %s [-n nprocs][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n",
221	+	argv[0]);
222	+	exit(1);
223	+	}
224		/* global program name */
225		gargv = argv;
226		/* initialize calcomp routines */
#	Line 180 | Line 239 | main(int argc, char *argv[])
239		}
240		if (argv[i][0] == '-')
241		switch (argv[i][1]) {
242	+	case 'r':               /* recover output */
243	+	if (argv[i][2]) break;
244	+	recover++;
245	+	continue;
246		case 'n':               /* number of processes */
247	<	if (argv[i][2] || i >= argc-1) break;
247	>	if (argv[i][2] || i >= argc-2) break;
248		nprocs = atoi(argv[++i]);
249		if (nprocs <= 0)
250		error(USER, "illegal number of processes");
#	Line 206 | Line 269 | main(int argc, char *argv[])
269		case 'f':               /* file or i/o format */
270		if (!argv[i][2]) {
271		char    *fpath;
272	<	if (i >= argc-1) break;
272	>	if (i >= argc-2) break;
273		fpath = getpath(argv[++i],
274		getrlibpath(), R_OK);
275		if (fpath == NULL) {
#	Line 221 | Line 284 | main(int argc, char *argv[])
284		setformat(argv[i]+2);
285		continue;
286		case 'e':               /* expression */
287	<	if (argv[i][2] || i >= argc-1) break;
287	>	if (argv[i][2] || i >= argc-2) break;
288		scompile(argv[++i], NULL, 0);
289		continue;
290		case 'o':               /* output file spec. */
291	<	if (argv[i][2] || i >= argc-1) break;
291	>	if (argv[i][2] || i >= argc-2) break;
292		curout = argv[++i];
293		continue;
294		case 'x':               /* horiz. output resolution */
295	<	if (argv[i][2] || i >= argc-1) break;
295	>	if (argv[i][2] || i >= argc-2) break;
296		xres = atoi(argv[++i]);
297		continue;
298		case 'y':               /* vert. output resolution */
299	<	if (argv[i][2] || i >= argc-1) break;
299	>	if (argv[i][2] || i >= argc-2) break;
300		yres = atoi(argv[++i]);
301		continue;
302	<	case 'b':               /* bin expression */
303	<	if (argv[i][2] || i >= argc-1) break;
302	>	case 'b':               /* bin expression/count */
303	>	if (i >= argc-2) break;
304	>	if (argv[i][2] == 'n') {
305	>	bincnt = atoi(argv[++i]);
306	>	continue;
307	>	}
308	>	if (argv[i][2]) break;
309		binval = argv[++i];
310		continue;
311		case 'm':               /* modifier name */
312	<	if (argv[i][2] || i >= argc-1) break;
312	>	if (argv[i][2] || i >= argc-2) break;
313		rtargv[rtargc++] = "-ti";
314		rtargv[rtargc++] = argv[++i];
315	<	addmodifier(argv[i], curout, binval);
315	>	addmodifier(argv[i], curout, binval, bincnt);
316		continue;
317	+	case 'M':               /* modifier file */
318	+	if (argv[i][2] || i >= argc-2) break;
319	+	rtargv[rtargc++] = "-tI";
320	+	rtargv[rtargc++] = argv[++i];
321	+	addmodfile(argv[i], curout, binval, bincnt);
322	+	continue;
323		}
324		rtargv[rtargc++] = argv[i];     /* assume rtrace option */
325		}
#	Line 294 | Line 368 | main(int argc, char *argv[])
368		error(USER, "missing octree argument");
369		rtargv[rtargc++] = octree = argv[i];
370		rtargv[rtargc] = NULL;
371	<	/* start rtrace & compute contributions */
371	>	/* start rtrace */
372		init(nprocs);
373	<	trace_contribs(stdin);
373	>	if (recover)            /* perform recovery if requested */
374	>	recover_output(stdin);
375	>	trace_contribs(stdin);  /* compute contributions */
376		quit(0);
377		}
378
379	+	#ifndef SIGALRM
380	+	#define SIGALRM SIGTERM
381	+	#endif
382		/* kill persistent rtrace process */
383		static void
384		killpersist(void)
385		{
386		FILE    *fp = fopen(persistfn, "r");
387	<	int     pid;
387	>	RT_PID  pid;
388
389		if (fp == NULL)
390		return;
#	Line 401 | Line 480 | init(int np)
480		rtp->next = NULL;               /* terminate list */
481		if (yres > 0) {
482		if (xres > 0)
483	<	raysleft = xres*yres;
483	>	raysleft = (unsigned long)xres*yres;
484		else
485		raysleft = yres;
486		} else
#	Line 409 | Line 488 | init(int np)
488		waitflush = xres;
489		}
490
491	+	/* grow modifier to accommodate more bins */
492	+	MODCONT *
493	+	growmodifier(MODCONT *mp, int nb)
494	+	{
495	+	if (nb <= mp->nbins)
496	+	return mp;
497	+	mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + sizeof(DCOLOR)*(nb-1));
498	+	if (mp == NULL)
499	+	error(SYSTEM, "out of memory in growmodifier");
500	+	memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(nb-mp->nbins));
501	+	mp->nbins = nb;
502	+	return mp;
503	+	}
504	+
505		/* add modifier to our list to track */
506		MODCONT *
507	<	addmodifier(char *modn, char *outf, char *binv)
507	>	addmodifier(char *modn, char *outf, char *binv, int bincnt)
508		{
509		LUENT   *lep = lu_find(&modconttab, modn);
510		MODCONT *mp;
511	+	int     i;
512
513		if (lep->data != NULL) {
514		sprintf(errmsg, "duplicate modifier '%s'", modn);
#	Line 427 | Line 521 | addmodifier(char *modn, char *outf, char *binv)
521		mp = (MODCONT *)malloc(sizeof(MODCONT));
522		if (mp == NULL)
523		error(SYSTEM, "out of memory in addmodifier");
430	–	lep->data = (char *)mp;
524		mp->outspec = outf;             /* XXX assumes static string */
525		mp->modname = modn;             /* XXX assumes static string */
526		if (binv != NULL)
#	Line 436 | Line 529 | addmodifier(char *modn, char *outf, char *binv)
529		mp->binv = eparse("0");
530		mp->nbins = 1;
531		setcolor(mp->cbin[0], 0., 0., 0.);
532	+	if (mp->binv->type == NUM)      /* assume one bin if constant */
533	+	bincnt = 1;
534	+	else if (bincnt > 1)
535	+	mp = growmodifier(mp, bincnt);
536	+	lep->data = (char *)mp;
537	+	/* allocate output streams */
538	+	for (i = outf==NULL || outf[0]=='!' ? 0 : bincnt; i--; )
539	+	getostream(mp->outspec, mp->modname, i, 1);
540		return mp;
541		}
542
543	+	/* add modifiers from a file list */
544	+	void
545	+	addmodfile(char *fname, char *outf, char *binv, int bincnt)
546	+	{
547	+	char    *mname[MAXMODLIST];
548	+	int     i;
549	+	/* find the file & store strings */
550	+	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
551	+	sprintf(errmsg, "cannot find modifier file '%s'", fname);
552	+	error(SYSTEM, errmsg);
553	+	}
554	+	for (i = 0; mname[i]; i++)      /* add each one */
555	+	addmodifier(mname[i], outf, binv, bincnt);
556	+	}
557	+
558		/* put string to stderr */
559		void
560		eputs(char  *s)
#	Line 454 | Line 570 | eputs(char  *s)
570		midline = s[strlen(s)-1] != '\n';
571		}
572
573	+	/* construct output file name and return flags whether modifier/bin present */
574	+	int
575	+	ofname(char *oname, const char *ospec, const char *mname, int bn)
576	+	{
577	+	const char      *mnp = NULL;
578	+	const char      *bnp = NULL;
579	+	const char      *cp;
580	+
581	+	if (ospec == NULL)
582	+	return -1;
583	+	for (cp = ospec; *cp; cp++)             /* check format position(s) */
584	+	if (*cp == '%') {
585	+	do
586	+	++cp;
587	+	while (isdigit(*cp));
588	+	switch (*cp) {
589	+	case '%':
590	+	break;
591	+	case 's':
592	+	if (mnp != NULL)
593	+	return -1;
594	+	mnp = cp;
595	+	break;
596	+	case 'd':
597	+	if (bnp != NULL)
598	+	return -1;
599	+	bnp = cp;
600	+	break;
601	+	default:
602	+	return -1;
603	+	}
604	+	}
605	+	if (mnp != NULL) {                      /* create file name */
606	+	if (bnp != NULL) {
607	+	if (bnp > mnp)
608	+	sprintf(oname, ospec, mname, bn);
609	+	else
610	+	sprintf(oname, ospec, bn, mname);
611	+	return OF_MODIFIER|OF_BIN;
612	+	}
613	+	sprintf(oname, ospec, mname);
614	+	return OF_MODIFIER;
615	+	}
616	+	if (bnp != NULL) {
617	+	sprintf(oname, ospec, bn);
618	+	return OF_BIN;
619	+	}
620	+	strcpy(oname, ospec);
621	+	return 0;
622	+	}
623	+
624		/* write header to the given output stream */
625		void
626	<	printheader(FILE *fout)
626	>	printheader(FILE *fout, const char *info)
627		{
628		extern char     VersionID[];
629		FILE            *fin = fopen(octree, "r");
#	Line 468 | Line 635 | printheader(FILE *fout)
635		printargs(gargc-1, gargv, fout);        /* add our command */
636		fprintf(fout, "SOFTWARE= %s\n", VersionID);
637		fputnow(fout);
638	+	if (info != NULL)                       /* add extra info if given */
639	+	fputs(info, fout);
640		switch (outfmt) {                       /* add output format */
641		case 'a':
642		fputformat("ascii", fout);
#	Line 483 | Line 652 | printheader(FILE *fout)
652		break;
653		}
654		fputc('\n', fout);
655	+	}
656	+
657	+	/* write resolution string to given output stream */
658	+	void
659	+	printresolu(FILE *fout)
660	+	{
661		if (xres > 0) {
662		if (yres > 0)                   /* resolution string */
663		fprtresolu(xres, yres, fout);
#	Line 490 | Line 665 | printheader(FILE *fout)
665		}
666		}
667
668	<	/* Get output file pointer (open and write header if new) */
669	<	FILE *
670	<	getofile(const char *ospec, const char *mname, int bn)
668	>	/* Get output stream pointer (open and write header if new and noopen==0) */
669	>	STREAMOUT *
670	>	getostream(const char *ospec, const char *mname, int bn, int noopen)
671		{
672	<	const char      *mnp = NULL;
673	<	const char      *bnp = NULL;
674	<	const char      *cp;
675	<	char            ofname[1024];
676	<	LUENT           *lep;
672	>	static STREAMOUT        stdos;
673	>	int                     ofl;
674	>	char                    oname[1024];
675	>	LUENT                   *lep;
676	>	STREAMOUT               *sop;
677
678		if (ospec == NULL) {                    /* use stdout? */
679	<	if (!using_stdout) {
679	>	if (!noopen && !using_stdout) {
680	>	stdos.reclen = 0;
681		if (outfmt != 'a')
682		SET_FILE_BINARY(stdout);
683		if (header)
684	<	printheader(stdout);
684	>	printheader(stdout, NULL);
685	>	printresolu(stdout);
686	>	using_stdout = 1;
687		}
688	<	using_stdout = 1;
689	<	return stdout;
688	>	stdos.ofp = stdout;
689	>	stdos.reclen += noopen;
690	>	return &stdos;
691		}
692	<	for (cp = ospec; *cp; cp++)             /* check format position(s) */
693	<	if (*cp == '%') {
694	<	do
695	<	++cp;
696	<	while (isdigit(*cp));
697	<	switch (*cp) {
519	<	case '%':
520	<	break;
521	<	case 's':
522	<	if (mnp != NULL)
523	<	goto badspec;
524	<	mnp = cp;
525	<	break;
526	<	case 'd':
527	<	if (bnp != NULL)
528	<	goto badspec;
529	<	bnp = cp;
530	<	break;
531	<	default:
532	<	goto badspec;
533	<	}
534	<	}
535	<	if (mnp != NULL) {                      /* create file name */
536	<	if (bnp != NULL) {
537	<	if (bnp > mnp)
538	<	sprintf(ofname, ospec, mname, bn);
539	<	else
540	<	sprintf(ofname, ospec, bn, mname);
541	<	} else
542	<	sprintf(ofname, ospec, mname);
543	<	} else if (bnp != NULL)
544	<	sprintf(ofname, ospec, bn);
545	<	else
546	<	strcpy(ofname, ospec);
547	<	lep = lu_find(&ofiletab, ofname);       /* look it up */
692	>	ofl = ofname(oname, ospec, mname, bn);  /* get output name */
693	>	if (ofl < 0) {
694	>	sprintf(errmsg, "bad output format '%s'", ospec);
695	>	error(USER, errmsg);
696	>	}
697	>	lep = lu_find(&ofiletab, oname);        /* look it up */
698		if (lep->key == NULL)                   /* new entry */
699	<	lep->key = strcpy((char *)malloc(strlen(ofname)+1), ofname);
700	<	if (lep->data == NULL) {                /* open output file */
701	<	FILE            *fp;
702	<	int             i;
703	<	if (ofname[0] == '!')           /* output to command */
704	<	fp = popen(ofname+1, "w");
699	>	lep->key = strcpy((char *)malloc(strlen(oname)+1), oname);
700	>	sop = (STREAMOUT *)lep->data;
701	>	if (sop == NULL) {                      /* allocate stream */
702	>	sop = (STREAMOUT *)malloc(sizeof(STREAMOUT));
703	>	if (sop == NULL)
704	>	error(SYSTEM, "out of memory in getostream");
705	>	sop->reclen = oname[0] == '!' ? CNT_PIPE : CNT_UNKNOWN;
706	>	sop->ofp = NULL;                /* open iff noopen==0 */
707	>	lep->data = (char *)sop;
708	>	}
709	>	if (!noopen && sop->ofp == NULL) {      /* open output stream */
710	>	long            i;
711	>	if (oname[0] == '!')            /* output to command */
712	>	sop->ofp = popen(oname+1, "w");
713		else
714	<	fp = fopen(ofname, "w");
715	<	if (fp == NULL) {
716	<	sprintf(errmsg, "cannot open '%s' for writing", ofname);
714	>	sop->ofp = fopen(oname, "w");
715	>	if (sop->ofp == NULL) {
716	>	sprintf(errmsg, "cannot open '%s' for writing", oname);
717		error(SYSTEM, errmsg);
718		}
719		if (outfmt != 'a')
720	<	SET_FILE_BINARY(fp);
721	<	if (header)
722	<	printheader(fp);
720	>	SET_FILE_BINARY(sop->ofp);
721	>	if (header) {
722	>	char    info[512];
723	>	char    *cp = info;
724	>	if (ofl & OF_MODIFIER || sop->reclen == 1) {
725	>	sprintf(cp, "MODIFIER=%s\n", mname);
726	>	while (*cp) ++cp;
727	>	}
728	>	if (ofl & OF_BIN) {
729	>	sprintf(cp, "BIN=%d\n", bn);
730	>	while (*cp) ++cp;
731	>	}
732	>	*cp = '\0';
733	>	printheader(sop->ofp, info);
734	>	}
735	>	printresolu(sop->ofp);
736		/* play catch-up */
737	<	for (i = 0; i < lastdone; i++) {
737	>	for (i = sop->reclen > 1 ? sop->reclen*lastdone : lastdone;
738	>	i--; ) {
739		static const DCOLOR     nocontrib = BLKCOLOR;
740	<	putcontrib(nocontrib, fp);
740	>	put_contrib(nocontrib, sop->ofp);
741		if (outfmt == 'a')
742	<	putc('\n', fp);
742	>	putc('\n', sop->ofp);
743		}
744		if (xres > 0)
745	<	fflush(fp);
574	<	lep->data = (char *)fp;
745	>	fflush(sop->ofp);
746		}
747	<	return (FILE *)lep->data;               /* return open file pointer */
748	<	badspec:
749	<	sprintf(errmsg, "bad output format '%s'", ospec);
579	<	error(USER, errmsg);
580	<	return NULL;            /* pro forma return */
747	>	if (sop->reclen != CNT_PIPE)            /* add to length if noopen */
748	>	sop->reclen += noopen;
749	>	return sop;                             /* return open stream */
750		}
751
752		/* read input ray into buffer */
#	Line 640 | Line 809 | add_contrib(const char *modn)
809		bn = (int)(evalue(mp->binv) + .5);
810		if (bn <= 0)
811		bn = 0;
812	<	else if (bn > mp->nbins) {      /* new bin */
813	<	mp = (MODCONT *)realloc(mp, sizeof(MODCONT) +
645	<	bn*sizeof(DCOLOR));
646	<	if (mp == NULL)
647	<	error(SYSTEM, "out of memory in add_contrib");
648	<	memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(bn+1-mp->nbins));
649	<	mp->nbins = bn+1;
650	<	le->data = (char *)mp;
651	<	}
812	>	else if (bn >= mp->nbins)       /* new bin */
813	>	le->data = (char *)(mp = growmodifier(mp, bn+1));
814		addcolor(mp->cbin[bn], rparams);
815		}
816
#	Line 656 | Line 818 | add_contrib(const char *modn)
818		static int
819		puteol(const LUENT *e, void *p)
820		{
821	<	FILE    *fp = (FILE *)e->data;
821	>	STREAMOUT       *sop = (STREAMOUT *)e->data;
822
823		if (outfmt == 'a')
824	<	putc('\n', fp);
824	>	putc('\n', sop->ofp);
825		if (!waitflush)
826	<	fflush(fp);
827	<	if (ferror(fp)) {
826	>	fflush(sop->ofp);
827	>	if (ferror(sop->ofp)) {
828		sprintf(errmsg, "write error on file '%s'", e->key);
829		error(SYSTEM, errmsg);
830		}
#	Line 671 | Line 833 | puteol(const LUENT *e, void *p)
833
834		/* put out ray contribution to file */
835		void
836	<	putcontrib(const DCOLOR cnt, FILE *fout)
836	>	put_contrib(const DCOLOR cnt, FILE *fout)
837		{
838		float   fv[3];
839		COLR    cv;
#	Line 702 | Line 864 | putcontrib(const DCOLOR cnt, FILE *fout)
864		void
865		done_contrib(void)
866		{
867	<	int     i, j;
868	<	MODCONT *mp;
867	>	int             i, j;
868	>	MODCONT         *mp;
869	>	STREAMOUT       *sop;
870		/* output modifiers in order */
871		for (i = 0; i < nmods; i++) {
872		mp = (MODCONT *)lu_find(&modconttab,modname[i])->data;
873	<	for (j = 0; j < mp->nbins; j++)
874	<	putcontrib(mp->cbin[j],
875	<	getofile(mp->outspec, mp->modname, j));
873	>	sop = getostream(mp->outspec, mp->modname, 0,0);
874	>	put_contrib(mp->cbin[0], sop->ofp);
875	>	if (mp->nbins > 3 &&            /* minor optimization */
876	>	sop == getostream(mp->outspec, mp->modname, 1,0))
877	>	for (j = 1; j < mp->nbins; j++)
878	>	put_contrib(mp->cbin[j], sop->ofp);
879	>	else
880	>	for (j = 1; j < mp->nbins; j++)
881	>	put_contrib(mp->cbin[j],
882	>	getostream(mp->outspec,mp->modname,j,0)->ofp);
883		/* clear for next ray tree */
884		memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins);
885		}
#	Line 831 | Line 1001 | wait_rproc(void)
1001		if (rt->bsiz + BUFSIZ <= treebufsiz)
1002		rt->bsiz = treebufsiz;
1003		else
1004	<	rt->bsiz = treebufsiz += BUFSIZ;
1004	>	treebufsiz = rt->bsiz += BUFSIZ;
1005		rt->buf = (char *)realloc(rt->buf, rt->bsiz);
1006		}
1007		if (rt->buf == NULL)
#	Line 872 | Line 1042 | trace_contribs(FILE *fin)
1042		struct rtproc   *rtp;
1043		/* loop over input */
1044		while ((iblen = getinp(inpbuf, fin)) > 0) {
1045	<	if (lastray+1 < lastray) {      /* counter rollover? */
1045	>	if (lastray+1 < lastray ||      /* need reset? */
1046	>	queue_length() > 10*nrtprocs()) {
1047		while (wait_rproc() != NULL)
1048		process_queue();
1049	<	lastdone = lastray = 0;
1049	>	if (lastray+1 < lastray)
1050	>	lastdone = lastray = 0;
1051		}
1052		rtp = get_rproc();              /* get avail. rtrace process */
1053		rtp->raynum = ++lastray;        /* assign ray to it */
1054		writebuf(rtp->pd.w, inpbuf, iblen);
1055	<	if (!--raysleft)
1055	>	if (raysleft && !--raysleft)
1056		break;
1057		process_queue();                /* catch up with results */
1058		}
1059		while (wait_rproc() != NULL)            /* process outstanding rays */
1060		process_queue();
1061	<	if (raysleft > 0)
1061	>	if (raysleft)
1062		error(USER, "unexpected EOF on input");
1063	+	lu_done(&ofiletab);                     /* close output files */
1064	+	}
1065	+
1066	+	/* seek on the given output file */
1067	+	static int
1068	+	myseeko(const LUENT *e, void *p)
1069	+	{
1070	+	STREAMOUT       *sop = (STREAMOUT *)e->data;
1071	+	off_t           nbytes = *(off_t *)p;
1072	+
1073	+	if (sop->reclen > 1)
1074	+	nbytes = nbytes * sop->reclen;
1075	+	if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) {
1076	+	sprintf(errmsg, "seek error on file '%s'", e->key);
1077	+	error(SYSTEM, errmsg);
1078	+	}
1079	+	}
1080	+
1081	+	/* recover output if possible */
1082	+	void
1083	+	recover_output(FILE *fin)
1084	+	{
1085	+	off_t           lastout = -1;
1086	+	int             outvsiz, recsiz;
1087	+	char            *outvfmt;
1088	+	int             i, j;
1089	+	MODCONT         *mp;
1090	+	int             ofl;
1091	+	char            oname[1024];
1092	+	LUENT           *ment, *oent;
1093	+	STREAMOUT       sout;
1094	+	off_t           nvals;
1095	+	int             xr, yr;
1096	+
1097	+	switch (outfmt) {
1098	+	case 'a':
1099	+	error(USER, "cannot recover ASCII output");
1100	+	return;
1101	+	case 'f':
1102	+	outvsiz = sizeof(float)*3;
1103	+	outvfmt = "float";
1104	+	break;
1105	+	case 'd':
1106	+	outvsiz = sizeof(double)*3;
1107	+	outvfmt = "double";
1108	+	break;
1109	+	case 'c':
1110	+	outvsiz = sizeof(COLR);
1111	+	outvfmt = COLRFMT;
1112	+	break;
1113	+	default:
1114	+	error(INTERNAL, "botched output format");
1115	+	return;
1116	+	}
1117	+	/* check modifier outputs */
1118	+	for (i = 0; i < nmods; i++) {
1119	+	ment = lu_find(&modconttab,modname[i]);
1120	+	mp = (MODCONT *)ment->data;
1121	+	if (mp->outspec == NULL)
1122	+	error(USER, "cannot recover from stdout");
1123	+	if (mp->outspec[0] == '!')
1124	+	error(USER, "cannot recover from command");
1125	+	for (j = 0; ; j++) {            /* check each bin's file */
1126	+	ofl = ofname(oname, mp->outspec, mp->modname, j);
1127	+	if (ofl < 0)
1128	+	error(USER, "bad output file specification");
1129	+	oent = lu_find(&ofiletab, oname);
1130	+	if (oent->data != NULL) {
1131	+	sout = *(STREAMOUT *)oent->data;
1132	+	} else {
1133	+	sout.reclen = CNT_UNKNOWN;
1134	+	sout.ofp = NULL;
1135	+	}
1136	+	if (sout.ofp != NULL) { /* already open? */
1137	+	if (ofl & OF_BIN)
1138	+	continue;
1139	+	break;
1140	+	}
1141	+	/* open output */
1142	+	sout.ofp = fopen(oname, "rb+");
1143	+	if (sout.ofp == NULL) {
1144	+	if (j)
1145	+	break;  /* assume end of modifier */
1146	+	sprintf(errmsg, "missing recover file '%s'",
1147	+	oname);
1148	+	error(USER, errmsg);
1149	+	}
1150	+	nvals = lseek(fileno(sout.ofp), 0, SEEK_END);
1151	+	if (nvals <= 0) {
1152	+	lastout = 0;    /* empty output, quit here */
1153	+	fclose(sout.ofp);
1154	+	break;
1155	+	}
1156	+	if (sout.reclen == CNT_UNKNOWN) {
1157	+	if (!(ofl & OF_BIN)) {
1158	+	sprintf(errmsg,
1159	+	"need -bn to recover file '%s'",
1160	+	oname);
1161	+	error(USER, errmsg);
1162	+	}
1163	+	recsiz = outvsiz;
1164	+	} else
1165	+	recsiz = outvsiz * sout.reclen;
1166	+
1167	+	lseek(fileno(sout.ofp), 0, SEEK_SET);
1168	+	if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) {
1169	+	sprintf(errmsg, "format mismatch for '%s'",
1170	+	oname);
1171	+	error(USER, errmsg);
1172	+	}
1173	+	if ((xres > 0) & (yres > 0) &&
1174	+	(!fscnresolu(&xr, &yr, sout.ofp) ||
1175	+	xr != xres ||
1176	+	yr != yres)) {
1177	+	sprintf(errmsg, "resolution mismatch for '%s'",
1178	+	oname);
1179	+	error(USER, errmsg);
1180	+	}
1181	+	nvals = (nvals - (off_t)ftell(sout.ofp)) / recsiz;
1182	+	if ((lastout < 0) | (nvals < lastout))
1183	+	lastout = nvals;
1184	+	if (oent->key == NULL)  /* new entry */
1185	+	oent->key = strcpy((char *)
1186	+	malloc(strlen(oname)+1), oname);
1187	+	if (oent->data == NULL)
1188	+	oent->data = (char *)malloc(sizeof(STREAMOUT));
1189	+	*(STREAMOUT *)oent->data = sout;
1190	+	if (!(ofl & OF_BIN))
1191	+	break;          /* no bin separation */
1192	+	}
1193	+	if (!lastout) {                 /* empty output */
1194	+	error(WARNING, "no previous data to recover");
1195	+	lu_done(&ofiletab);     /* reclose all outputs */
1196	+	return;
1197	+	}
1198	+	if (j > mp->nbins)              /* reallocate modifier bins */
1199	+	ment->data = (char *)(mp = growmodifier(mp, j));
1200	+	}
1201	+	if (lastout < 0) {
1202	+	error(WARNING, "no output files to recover");
1203	+	return;
1204	+	}
1205	+	if (raysleft && lastout >= raysleft) {
1206	+	error(WARNING, "output appears to be complete");
1207	+	/* XXX should read & discard input? */
1208	+	quit(0);
1209	+	}
1210	+	/* seek on all files */
1211	+	nvals = lastout * outvsiz;
1212	+	lu_doall(&ofiletab, myseeko, &nvals);
1213	+	/* skip repeated input */
1214	+	for (nvals = 0; nvals < lastout; nvals++)
1215	+	if (getinp(oname, fin) <= 0)
1216	+	error(USER, "unexpected EOF on input");
1217	+	lastray = lastdone = (unsigned long)lastout;
1218	+	if (raysleft)
1219	+	raysleft -= lastray;
1220		}

Diff Legend

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