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.15 by greg, Thu Jun 9 18:27:44 2005 UTC vs.
Revision 1.26 by schorsch, Mon Sep 19 11:30:11 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
#	Line 72 | Line 74 | struct rtproc {
74		};                              /* rtrace process buffer */
75
76		/* rtrace command and defaults */
77	<	char            *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3",
77	>	char            *rtargv[256+2*MAXMODLIST] = { "rtrace",
78	>	"-dj", ".5", "-dr", "3",
79		"-ab", "1", "-ad", "128", };
80		int  rtargc = 9;
81		/* overriding rtrace options */
#	Line 110 | Line 113 | const char     *modname[MAXMODLIST];   /* ordered modifier n
113		int             nmods = 0;              /* number of modifiers */
114
115		MODCONT *addmodifier(char *modn, char *outf, char *binv);
116	+	void addmodfile(char *fname, char *outf, char *binv);
117
118		void init(int np);
119		int done_rprocs(struct rtproc *rtp);
#	Line 169 | Line 173 | main(int argc, char *argv[])
173		char    *binval = NULL;
174		char    fmt[8];
175		int     i, j;
176	+	/* need at least one argument */
177	+	if (argc < 2) {
178	+	fprintf(stderr,
179	+	"Usage: %s [-n nprocs][-r][-e expr][-f source][-o ospec][-b binv] {-m mod | -M file} [rtrace options] octree\n",
180	+	argv[0]);
181	+	exit(1);
182	+	}
183		/* global program name */
184		gargv = argv;
185		/* initialize calcomp routines */
#	Line 192 | Line 203 | main(int argc, char *argv[])
203		recover++;
204		continue;
205		case 'n':               /* number of processes */
206	<	if (argv[i][2] || i >= argc-1) break;
206	>	if (argv[i][2] || i >= argc-2) break;
207		nprocs = atoi(argv[++i]);
208		if (nprocs <= 0)
209		error(USER, "illegal number of processes");
#	Line 217 | Line 228 | main(int argc, char *argv[])
228		case 'f':               /* file or i/o format */
229		if (!argv[i][2]) {
230		char    *fpath;
231	<	if (i >= argc-1) break;
231	>	if (i >= argc-2) break;
232		fpath = getpath(argv[++i],
233		getrlibpath(), R_OK);
234		if (fpath == NULL) {
#	Line 232 | Line 243 | main(int argc, char *argv[])
243		setformat(argv[i]+2);
244		continue;
245		case 'e':               /* expression */
246	<	if (argv[i][2] || i >= argc-1) break;
246	>	if (argv[i][2] || i >= argc-2) break;
247		scompile(argv[++i], NULL, 0);
248		continue;
249		case 'o':               /* output file spec. */
250	<	if (argv[i][2] || i >= argc-1) break;
250	>	if (argv[i][2] || i >= argc-2) break;
251		curout = argv[++i];
252		continue;
253		case 'x':               /* horiz. output resolution */
254	<	if (argv[i][2] || i >= argc-1) break;
254	>	if (argv[i][2] || i >= argc-2) break;
255		xres = atoi(argv[++i]);
256		continue;
257		case 'y':               /* vert. output resolution */
258	<	if (argv[i][2] || i >= argc-1) break;
258	>	if (argv[i][2] || i >= argc-2) break;
259		yres = atoi(argv[++i]);
260		continue;
261		case 'b':               /* bin expression */
262	<	if (argv[i][2] || i >= argc-1) break;
262	>	if (argv[i][2] || i >= argc-2) break;
263		binval = argv[++i];
264		continue;
265		case 'm':               /* modifier name */
266	<	if (argv[i][2] || i >= argc-1) break;
266	>	if (argv[i][2] || i >= argc-2) break;
267		rtargv[rtargc++] = "-ti";
268		rtargv[rtargc++] = argv[++i];
269		addmodifier(argv[i], curout, binval);
270		continue;
271	+	case 'M':               /* modifier file */
272	+	if (argv[i][2] || i >= argc-2) break;
273	+	rtargv[rtargc++] = "-tI";
274	+	rtargv[rtargc++] = argv[++i];
275	+	addmodfile(argv[i], curout, binval);
276	+	continue;
277		}
278		rtargv[rtargc++] = argv[i];     /* assume rtrace option */
279		}
#	Line 305 | Line 322 | main(int argc, char *argv[])
322		error(USER, "missing octree argument");
323		rtargv[rtargc++] = octree = argv[i];
324		rtargv[rtargc] = NULL;
325	<	/* start rtrace & compute contributions */
325	>	/* start rtrace */
326		init(nprocs);
327		if (recover)            /* perform recovery if requested */
328		recover_output(stdin);
329	<	trace_contribs(stdin);
329	>	trace_contribs(stdin);  /* compute contributions */
330		quit(0);
331		}
332
333	+	#ifndef SIGALRM
334	+	#define SIGALRM SIGTERM
335	+	#endif
336		/* kill persistent rtrace process */
337		static void
338		killpersist(void)
339		{
340		FILE    *fp = fopen(persistfn, "r");
341	<	int     pid;
341	>	RT_PID  pid;
342
343		if (fp == NULL)
344		return;
#	Line 452 | Line 472 | addmodifier(char *modn, char *outf, char *binv)
472		return mp;
473		}
474
475	+	/* add modifiers from a file list */
476	+	void
477	+	addmodfile(char *fname, char *outf, char *binv)
478	+	{
479	+	char    *mname[MAXMODLIST];
480	+	int     i;
481	+	/* find the file & store strings */
482	+	if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) {
483	+	sprintf(errmsg, "cannot find modifier file '%s'", fname);
484	+	error(SYSTEM, errmsg);
485	+	}
486	+	for (i = 0; mname[i]; i++)      /* add each one */
487	+	addmodifier(mname[i], outf, binv);
488	+	}
489	+
490		/* put string to stderr */
491		void
492		eputs(char  *s)
#	Line 598 | Line 633 | getofile(const char *ospec, const char *mname, int bn)
633		if (header) {
634		char    info[512];
635		char    *cp = info;
636	<	if (ofl & OF_MODIFIER) {
637	<	sprintf(cp, "MODIFIER=%s\n", mname);
603	<	while (*cp) ++cp;
604	<	}
636	>	sprintf(cp, "MODIFIER=%s\n", mname);
637	>	while (*cp) ++cp;
638		if (ofl & OF_BIN) {
639		sprintf(cp, "BIN=%d\n", bn);
640		while (*cp) ++cp;
#	Line 1007 | Line 1040 | recover_output(FILE *fin)
1040		error(USER, "cannot recover from command");
1041		/* open output */
1042		fp = fopen(oname, "rb+");
1043	<	if (fp == NULL)
1044	<	break;          /* must be end of modifier */
1043	>	if (fp == NULL) {
1044	>	if (j)
1045	>	break;  /* assume end of modifier */
1046	>	sprintf(errmsg, "missing recover file '%s'",
1047	>	oname);
1048	>	error(USER, errmsg);
1049	>	}
1050		nvals = lseek(fileno(fp), 0, SEEK_END);
1051		if (nvals <= 0) {
1052		lastout = 0;    /* empty output, quit here */
#	Line 1045 | Line 1083 | recover_output(FILE *fin)
1083		break;          /* no bin separation */
1084		}
1085		if (!lastout) {                 /* empty output */
1086	<	error(WARNING, "no data to recover");
1086	>	error(WARNING, "no previous data to recover");
1087		lu_done(&ofiletab);     /* reclose all outputs */
1088		return;
1089		}
#	Line 1060 | Line 1098 | recover_output(FILE *fin)
1098		}
1099		}
1100		if (lastout < 0) {
1101	<	error(WARNING, "no existing output to recover");
1101	>	error(WARNING, "no output files to recover");
1102		return;
1103	+	}
1104	+	if (raysleft && lastout >= raysleft) {
1105	+	error(WARNING, "output appears to be complete");
1106	+	/* XXX should read & discard input? */
1107	+	quit(0);
1108		}
1109		/* seek on all files */
1110		nvals = lastout * outvsiz;

Diff Legend

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