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.28 by greg, Wed Sep 21 17:17:24 2005 UTC vs.
Revision 1.30 by greg, Wed Oct 5 19:44:17 2005 UTC

#	Line 57 | Line 57 | LUTAB  ofiletab = LU_SINIT(free,closefile);    /* output f
57		FILE *getofile(const char *ospec, const char *mname, int bn);
58		int ofname(char *oname, const char *ospec, const char *mname, int bn);
59		void printheader(FILE *fout, const char *info);
60	+	void printresolu(FILE *fout);
61
62		/*
63		* The rcont structure is used to manage i/o with a particular
#	Line 112 | Line 113 | int            using_stdout = 0;       /* are we using stdout? */
113		const char      *modname[MAXMODLIST];   /* ordered modifier name list */
114		int             nmods = 0;              /* number of modifiers */
115
116	+	#define queue_length()          (lastray - lastdone)
117	+
118		MODCONT *addmodifier(char *modn, char *outf, char *binv);
119		void addmodfile(char *fname, char *outf, char *binv);
120
#	Line 128 | Line 131 | void put_contrib(const DCOLOR cnt, FILE *fout);
131		void add_contrib(const char *modn);
132		void done_contrib(void);
133
134	+	/* return number of open rtrace processes */
135	+	static int
136	+	nrtprocs(void)
137	+	{
138	+	int     nrtp = 0;
139	+	struct rtproc   *rtp;
140	+
141	+	for (rtp = &rt0; rtp != NULL; rtp = rtp->next)
142	+	nrtp += rtp->pd.running;
143	+	return(nrtp);
144	+	}
145	+
146		/* set input/output format */
147		static void
148		setformat(const char *fmt)
#	Line 584 | Line 599 | printheader(FILE *fout, const char *info)
599		break;
600		}
601		fputc('\n', fout);
602	+	}
603	+
604	+	/* write resolution string to given output stream */
605	+	void
606	+	printresolu(FILE *fout)
607	+	{
608		if (xres > 0) {
609		if (yres > 0)                   /* resolution string */
610		fprtresolu(xres, yres, fout);
#	Line 605 | Line 626 | getofile(const char *ospec, const char *mname, int bn)
626		SET_FILE_BINARY(stdout);
627		if (header)
628		printheader(stdout, NULL);
629	+	printresolu(stdout);
630		}
631		using_stdout = 1;
632		return stdout;
#	Line 633 | Line 655 | getofile(const char *ospec, const char *mname, int bn)
655		if (header) {
656		char    info[512];
657		char    *cp = info;
658	<	sprintf(cp, "MODIFIER=%s\n", mname);
659	<	while (*cp) ++cp;
658	>	if (ofl & OF_MODIFIER) {
659	>	sprintf(cp, "MODIFIER=%s\n", mname);
660	>	while (*cp) ++cp;
661	>	}
662		if (ofl & OF_BIN) {
663		sprintf(cp, "BIN=%d\n", bn);
664		while (*cp) ++cp;
#	Line 642 | Line 666 | getofile(const char *ospec, const char *mname, int bn)
666		*cp = '\0';
667		printheader(fp, info);
668		}
669	+	printresolu(fp);
670		/* play catch-up */
671		for (i = 0; i < lastdone; i++) {
672		static const DCOLOR     nocontrib = BLKCOLOR;
#	Line 956 | Line 981 | trace_contribs(FILE *fin)
981		struct rtproc   *rtp;
982		/* loop over input */
983		while ((iblen = getinp(inpbuf, fin)) > 0) {
984	<	if (lastray+1 < lastray) {      /* counter rollover? */
984	>	if (lastray+1 < lastray ||      /* need reset? */
985	>	queue_length() > 5*nrtprocs()) {
986		while (wait_rproc() != NULL)
987		process_queue();
988		lastdone = lastray = 0;

Diff Legend

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