ViewVC Help

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

root/Development/ray/src/rt/RcontribSimulManager.cpp

Comparing ray/src/rt/RcontribSimulManager.cpp (file contents):
Revision 2.2 by greg, Tue Oct 29 19:47:19 2024 UTC vs.
Revision 2.18 by greg, Fri Oct 24 18:37:05 2025 UTC

#	Line 24 | Line 24 | extern const char      HDRSTR[];
24		extern const char       BIGEND[];
25		extern const char       FMTSTR[];
26
27	–	int     contrib = 0;                    // computing contributions?
28	–
29	–	int     xres = 0;                       // horizontal (scan) size
30	–	int     yres = 0;                       // vertical resolution
31	–
27		// new/exclusive, overwrite if exists, or recover data
28		int     RSDOflags[] = {RDSwrite|RDSexcl|RDSextend, RDSwrite|RDSextend,
29		RDSread|RDSwrite};
#	Line 40 | Line 35 | static const char      ROWZEROSTR[] = "NROWS=00000000000000
35		struct RcontribMod {
36		RcontribOutput *        opl;            // pointer to first output channel
37		char *                  params;         // parameters string
38	<	EPNODE *                binv;           // bin expression
38	>	EPNODE *                binv;           // bin expression (NULL if 1 bin)
39		int                     nbins;          // bin count this modifier
40		int                     coffset;        // column offset in bytes
41		DCOLORV                 cbin[1];        // bin accumulator (extends struct)
#	Line 57 | Line 52 | struct RowAssignment {
52		uint32                  ac;             // accumulation count
53		};
54
55	<	// Our default data share function
61	<	RdataShare *
62	<	defDataShare(const char *name, RCOutputOp op, size_t siz)
63	<	{
64	<	return new RdataShareMap(name, RSDOflags[op], siz);
65	<	}
55	>	static const char       ROW_DONE[] = "ROW FINISHED\n";
56
57	<	// Allocate rcontrib accumulator
58	<	RcontribMod *
57	>	// allocate rcontrib accumulator
58	>	static RcontribMod *
59		NewRcMod(const char *prms, const char *binexpr, int ncbins)
60		{
61	<	if (ncbins <= 0) return NULL;
61	>	if (binexpr && !*binexpr) binexpr = NULL;
62		if (!prms) prms = "";
63	<	if (!binexpr | (ncbins == 1))
64	<	binexpr = "0";
65	<
63	>	if ((ncbins > 1) & !binexpr) {
64	>	error(USER, "missing bin expression");
65	>	return NULL;
66	>	}
67	>	if (ncbins < 1) ncbins = 1;
68	>
69		RcontribMod *   mp = (RcontribMod *)ecalloc(1, sizeof(RcontribMod) +
70		sizeof(DCOLORV)*(NCSAMP*ncbins-1) +
71		strlen(prms)+1);
72
73	+	if (binexpr) {                          // get/check bin expression
74	+	mp->binv = eparse(const_cast<char *>(binexpr));
75	+	if (mp->binv->type == NUM) {    // constant expression (0)?
76	+	if ((int)evalue(mp->binv) != 0) {
77	+	sprintf(errmsg, "illegal non-zero constant for bin (%s)",
78	+	binexpr);
79	+	error(USER, errmsg);
80	+	}
81	+	if (ncbins > 1) {
82	+	sprintf(errmsg, "bad bin count (%d should be 1)", ncbins);
83	+	error(USER, errmsg);
84	+	}
85	+	epfree(mp->binv, true);
86	+	mp->binv = NULL;
87	+	prms = "";
88	+	ncbins = 1;
89	+	}
90	+	}
91		mp->params = strcpy((char *)(mp->cbin + ncbins*NCSAMP), prms);
81	–	mp->binv = eparse(const_cast<char *>(binexpr));
92		mp->nbins = ncbins;
93		return mp;
94		}
95
96	<	// Free an RcontribMod
96	>	// Free an RcontribMod (public for RcontribSimulManager constructor)
97		void
98		FreeRcMod(void *p)
99		{
100		if (!p) return;
101	<	epfree((*(RcontribMod *)p).binv, true);
101	>	EPNODE *        bep = (*(RcontribMod *)p).binv;
102	>	if (bep) epfree(bep, true);
103		efree(p);
104		}
105
106	+	// Get format identifier
107	+	const char *
108	+	formstr(int f)
109	+	{
110	+	switch (f) {
111	+	case 'a': return("ascii");
112	+	case 'f': return("float");
113	+	case 'd': return("double");
114	+	case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT);
115	+	}
116	+	return("unknown");
117	+	}
118	+
119	+	// Standard file data share function
120	+	RdataShare *
121	+	fileDataShare(const char *name, RCOutputOp op, size_t siz)
122	+	{
123	+	if (op == RCOrecover && access(name, R_OK|W_OK) < 0) {
124	+	sprintf(errmsg, "cannot recover from '%s'", name);
125	+	error(SYSTEM, errmsg);
126	+	return NULL;
127	+	}
128	+	return new RdataShareFile(name, RSDOflags[op], siz);
129	+	}
130	+
131	+	// Memory-mapped data share function
132	+	RdataShare *
133	+	mapDataShare(const char *name, RCOutputOp op, size_t siz)
134	+	{
135	+	if (op == RCOrecover && access(name, R_OK|W_OK) < 0) {
136	+	sprintf(errmsg, "cannot recover from '%s'", name);
137	+	error(SYSTEM, errmsg);
138	+	return NULL;
139	+	}
140	+	return new RdataShareMap(name, RSDOflags[op], siz);
141	+	}
142	+
143		// Set output format ('f', 'd', or 'c')
144		bool
145		RcontribSimulManager::SetDataFormat(int ty)
#	Line 135 | Line 183 | RcontribSimulManager::RctCall(RAY *r, void *cd)
183		if (!mp)
184		return 0;               // not in our modifier list
185
186	<	worldfunc(RCCONTEXT, r);        // compute bin #
187	<	set_eparams(mp->params);
188	<	double          bval = evalue(mp->binv);
189	<	if (bval <= -.5)
190	<	return 0;       // silently ignore negative bin index
191	<	DCOLORV *       dvp = (*mp)[int(bval + .5)];
186	>	int                     bi = 0; // get bin index
187	>	if (mp->binv) {
188	>	worldfunc(RCCONTEXT, r);
189	>	set_eparams(mp->params);
190	>	double          bval = evalue(mp->binv);
191	>	if (bval <= -.5)
192	>	return 0;       // silently ignore negative bin index
193	>	bi = int(bval + .5);
194	>	}
195	>	DCOLORV *       dvp = (*mp)[bi];
196		if (!dvp) {
197	<	sprintf(errmsg, "bad bin number for '%s' (%.1f ignored)", mname, bval);
197	>	sprintf(errmsg, "bad bin number for '%s' (%d ignored)", mname, bi);
198		error(WARNING, errmsg);
199		return 0;
200		}
201		SCOLOR          contr;
202		raycontrib(contr, r, PRIMARY);          // compute coefficient
203	<	if (contrib)
203	>	if (rcp->HasFlag(RCcontrib))
204		smultscolor(contr, r->rcol);    // -> value contribution
205	+
206		for (int i = 0; i < NCSAMP; i++)
207		*dvp++ += contr[i];             // accumulate color/spectrum
208		return 1;
#	Line 178 | Line 231 | bool
231		RcontribSimulManager::AddModifier(const char *modn, const char *outspec,
232		const char *prms, const char *binval, int bincnt)
233		{
234	<	if (!modn | !outspec | (bincnt <= 0) || !*modn | !*outspec) {
234	>	if (!modn | !outspec || !*modn | !*outspec) {
235		error(WARNING, "ignoring bad call to AddModifier()");
236		return false;
237		}
238	+	if (*outspec == '!') {
239	+	error(USER, "command output not supported by RcontribSimulManager");
240	+	return false;
241	+	}
242		if (!nChan) {                           // initial call?
243	+	if ((xres < 0) | (yres <= 0)) {
244	+	error(USER, "xres, yres must be set before first modifier");
245	+	return false;
246	+	}
247		if (!SetDataFormat(dtyp))
248		return false;
249		nChan = NCSAMP;
250		} else if (nChan != NCSAMP) {
251	<	error(INTERNAL, "number of spectral channels must be fixed");
251	>	error(USER, "# spectral channels must be fixed in AddModifier()");
252		return false;
253		}
254		if (Ready()) {
#	Line 210 | Line 271 | RcontribSimulManager::AddModifier(const char *modn, co
271		const int       binndx = hasFormat(outspec, "diouxX");
272		int             bin0 = 0;
273		char            fnbuf[512];
274	<	if (!modndx | (modndx > binndx))
274	>	if (!modndx || (binndx > 0) & (modndx > binndx))
275		sprintf(fnbuf, outspec, bin0, modn);
276		else
277		sprintf(fnbuf, outspec, modn, bin0);
#	Line 239 | Line 300 | RcontribSimulManager::AddModifier(const char *modn, co
300		mp->opl = op;                   // first (maybe only) output channel
301		if (modndx)                     // remember modifier if part of name
302		op->omod = lp->key;
303	<	if (binndx > 0) {               // append output image/bin list
303	>	if (binndx) {                   // append output image/bin list
304		op->rowBytes += dsiz;
305		op->obin = bin0;
306		for (bincnt = 1; bincnt < mp->nbins; bincnt++) {
307	<	if (!modndx | (modndx > binndx))
307	>	if (!modndx || (binndx > 0) &  (modndx > binndx))
308		sprintf(fnbuf, outspec, bin0+bincnt, modn);
309		else
310		sprintf(fnbuf, outspec, modn, bin0+bincnt);
#	Line 262 | Line 323 | RcontribSimulManager::AddModifier(const char *modn, co
323		op->rowBytes += dsiz;
324		}
325		} else                          // else send all results to this channel
326	<	op->rowBytes += bincnt*dsiz;
326	>	op->rowBytes += mp->nbins*dsiz;
327		return true;
328		}
329
#	Line 283 | Line 344 | RcontribSimulManager::AddModFile(const char *modfn, co
344		}
345		char            mod[MAXSTR];
346		while (fgetword(mod, sizeof(mod), fp))
347	<	if (!AddModifier(mod, outspec, prms, binval, bincnt))
347	>	if (!AddModifier(mod, outspec, prms, binval, bincnt)) {
348	>	fclose(fp);
349		return false;
350	+	}
351		fclose(fp);
352		return true;
353		}
354
355	+	// call-back to check if modifier has been loaded
356	+	static int
357	+	checkModExists(const LUENT *lp, void *p)
358	+	{
359	+	OBJECT  mod = modifier(lp->key);
360	+
361	+	if ((mod != OVOID) & (mod < nsceneobjs))
362	+	return 1;
363	+
364	+	sprintf(errmsg, "tracked modifier '%s' not found in main scene", lp->key);
365	+	error(WARNING, errmsg);
366	+	return 0;
367	+	}
368	+
369		// Prepare output channels and return # completed rows
370		int
371		RcontribSimulManager::PrepOutput()
372		{
373		if (!outList || !RtraceSimulManager::Ready()) {
374	<	error(INTERNAL, "PrepOutput() called before octree & modifiers assigned");
374	>	error(INTERNAL, "PrepOutput() called before octree & modifiers set");
375		return -1;
376		}
377	+	if (!cdsF) {
378	+	error(INTERNAL, "missing RdataShare constructor call (cdsF)");
379	+	return -1;
380	+	}
381	+	if (lu_doall(&modLUT, checkModExists, NULL) < 0)
382	+	return -1;
383	+
384	+	outList->nRows = yres * (xres + !xres); // all outputs have same #rows
385		int     remWarnings = 20;
386		for (RcontribOutput *op = outList; op; op = op->next) {
387		if (op->rData) {
388		error(INTERNAL, "output channel already open in PrepOutput()");
389		return -1;
390		}
391	<	op->nRows = yres * (xres + !xres);
391	>	op->nRows = outList->nRows;
392		op->rData = (*cdsF)(op->ofname, outOp,
393		GetHeadLen()+1024 + op->nRows*op->rowBytes);
394		freeqstr(op->ofname); op->ofname = NULL;
#	Line 312 | Line 397 | RcontribSimulManager::PrepOutput()
397		if (rd < 0)
398		return -1;
399		if (rd >= op->nRows) {
400	<	if (remWarnings >= 0) {
401	<	sprintf(errmsg, "recovered output '%s' already done",
400	>	if (remWarnings > 0) {
401	>	sprintf(errmsg, "recovered output '%s' is complete",
402		op->GetName());
403	<	error(WARNING, remWarnings ? errmsg : "etc...");
319	<	remWarnings--;
403	>	error(WARNING, --remWarnings ? errmsg : "etc...");
404		}
405		rd = op->nRows;
406		}
#	Line 358 | Line 442 | RcontribOutput::NewHeader(const RcontribSimulManager *
442		strcpy(hdr+begData, ROWZEROSTR);
443		rowCountPos = begData+LNROWSTR;
444		begData += sizeof(ROWZEROSTR)-1;
445	<	if (!xres | (rowBytes > esiz)) {
445	>	if (!rcp->xres | (rowBytes > esiz)) {
446		sprintf(hdr+begData, "NCOLS=%d\n", int(rowBytes/esiz));
447		begData += strlen(hdr+begData);
448		}
#	Line 396 | Line 480 | RcontribOutput::NewHeader(const RcontribSimulManager *
480		hdr[begData++] = ' ';
481		hdr[begData++] = '\n';          // EOL for data format
482		hdr[begData++] = '\n';          // end of nominal header
483	<	if ((xres > 0) & (rowBytes == esiz)) {  // tack on resolution string?
484	<	sprintf(hdr+begData, PIXSTDFMT, yres, xres);
483	>	if ((rcp->xres > 0) & (rowBytes == esiz)) {     // tack on resolution string?
484	>	sprintf(hdr+begData, PIXSTDFMT, rcp->yres, rcp->xres);
485		begData += strlen(hdr+begData);
486		}
487		return rData->ReleaseMemory(hdr, RDSwrite);
#	Line 443 | Line 527 | RcontribOutput::CheckHeader(const RcontribSimulManager
527		return -1;
528		}
529		// check format
530	<	if (!(cp = findArgs(hdr, FMTSTR, begData)) || strcmp(cp, formstr(etyp))) {
530	>	if (!(cp = findArgs(hdr, FMTSTR, begData)) ||
531	>	strncmp(cp, formstr(etyp), strlen(formstr(etyp)))) {
532		sprintf(errmsg, "expected %s%s in '%s'", FMTSTR, formstr(etyp), GetName());
533		error(USER, errmsg);
534		return -1;
535		}
536		// check #columns
537		if (((cp = findArgs(hdr, "NCOLS=", begData)) && atoi(cp)*esiz != rowBytes) ||
538	<	!xres | (rowBytes > esiz)) {
538	>	!rcp->xres | (rowBytes > esiz)) {
539		sprintf(errmsg, "expected NCOLS=%d in '%s'",
540		int(rowBytes/esiz), GetName());
541		error(USER, errmsg);
#	Line 465 | Line 550 | RcontribOutput::CheckHeader(const RcontribSimulManager
550		rowCountPos = cp - hdr;
551		int     rlast = atoi(cp);
552		begData++;                              // advance past closing EOL
553	<	if ((xres > 0) & (rowBytes == esiz)) {  // check/skip resolution string?
553	>	if ((rcp->xres > 0) & (rowBytes == esiz)) {     // check/skip resolution string?
554		char    rbuf[64];
555	<	sprintf(rbuf, PIXSTDFMT, yres, xres);
555	>	sprintf(rbuf, PIXSTDFMT, rcp->yres, rcp->xres);
556		int     rlen = strlen(rbuf);
557		if (strncmp(rbuf, hdr+begData, rlen)) {
558		sprintf(errmsg, "bad resolution string in '%s'", GetName());
#	Line 541 | Line 626 | putModContrib(const LUENT *lp, void *p)
626		}
627		} break;
628		default:
629	<	error(CONSISTENCY, "unsupported output type in sendModContrib()");
629	>	error(CONSISTENCY, "unsupported output type in putModContrib()");
630		return -1;
631		}
632		// clear for next tally
#	Line 560 | Line 645 | RcontribSimulManager::ComputeRecord(const FVECT orig_d
645		return 0;
646		}
647		if (nkids > 0) {                        // in parent process?
648	<	int     k = GetChild();         // updates output rows
649	<	if (k < 0) return -1;           // can't really happen
648	>	int     k = GetChild(false);    // updates output rows
649	>	if (k < 0) return -1;           // someone died?
650		RowAssignment   rass;
651		rass.row = kidRow[k] = rInPos++;
652		rass.ac = accum;
#	Line 606 | Line 691 | RcontribSimulManager::GetChild(bool forceWait)
691		return -1;
692		// take inventory
693		int     pn, n = 0;
694	<	fd_set  writeset, errset;
695	<	FD_ZERO(&writeset); FD_ZERO(&errset);
694	>	fd_set  readset, errset;
695	>	FD_ZERO(&readset); FD_ZERO(&errset);
696		for (pn = nkids; pn--; ) {
697		if (kidRow[pn] < 0) {           // child already ready?
698		if (forceWait) continue;
699		return pn;              // good enough
700		}
701	<	FD_SET(kid[pn].w, &writeset);   // will check on this one
702	<	FD_SET(kid[pn].w, &errset);
703	<	if (kid[pn].w >= n)
704	<	n = kid[pn].w + 1;
701	>	FD_SET(kid[pn].r, &readset);    // will check on this one
702	>	FD_SET(kid[pn].r, &errset);
703	>	if (kid[pn].r >= n)
704	>	n = kid[pn].r + 1;
705		}
706		if (!n)                                 // every child is idle?
707		return -1;
708		// wait on "busy" child(ren)
709	<	while ((n = select(n, NULL, &writeset, &errset, NULL)) <= 0)
709	>	while ((n = select(n, &readset, NULL, &errset, NULL)) <= 0)
710		if (errno != EINTR) {
711		error(SYSTEM, "select call failed in GetChild()");
712		return -1;
713		}
714	+	char    buf[sizeof(ROW_DONE)] = "X";
715		pn = -1;                                // get flags set by select
716		for (n = nkids; n--; )
717		if (kidRow[n] >= 0 &&
718	<	FD_ISSET(kid[n].w, &writeset) |
719	<	FD_ISSET(kid[n].w, &errset)) {
718	>	FD_ISSET(kid[n].r, &readset) |
719	>	FD_ISSET(kid[n].r, &errset)) {
720	>	// check for error
721	>	if (FD_ISSET(kid[n].r, &errset) ||
722	>	read(kid[n].r, buf, sizeof(ROW_DONE)) <= 0 ||
723	>	memcmp(buf, ROW_DONE, sizeof(ROW_DONE)))
724	>	return -1;
725		// update output row counts
726		UpdateRowsDone(kidRow[n]);
727	<	kidRow[n] = -1;         // flag it available
727	>	kidRow[n] = -1;         // flag child available
728		pn = n;
729		}
730		return pn;
#	Line 671 | Line 762 | RcontribSimulManager::RunChild()
762		error(CONSISTENCY, "bad accumulator count in child");
763		exit(1);
764		}
765	<	if (rass.ac > accum)
766	<	vecList = (FVECT *)erealloc(vecList,
767	<	sizeof(FVECT)*2*rass.ac);
765	>	if (rass.ac > accum) {
766	>	efree(vecList);
767	>	vecList = (FVECT *)emalloc(sizeof(FVECT)*2*rass.ac);
768	>	}
769		accum = rass.ac;
770		rInPos = rass.row;
771
#	Line 683 | Line 775 | RcontribSimulManager::RunChild()
775
776		if (ComputeRecord(vecList) <= 0)
777		exit(1);
778	+	// signal this row is done
779	+	if (write(1, ROW_DONE, sizeof(ROW_DONE)) != sizeof(ROW_DONE))
780	+	exit(1);
781		}
782		if (nr) {
783		error(SYSTEM, "read error in child process");
#	Line 708 | Line 803 | RcontribSimulManager::StartKids(int n2go)
803		fflush(stdout);                         // shouldn't use, anyway
804		while (nkids < n2go) {
805		kid[nkids] = sp_inactive;
711	–	kid[nkids].w = dup(1);
712	–	kid[nkids].flags |= PF_FILT_OUT;
806		int     rv = open_process(&kid[nkids], NULL);
807		if (!rv) {                      // in child process?
808	<	while (nkids-- > 0)
808	>	while (nkids-- > 0) {
809	>	close(kid[nkids].r);
810		close(kid[nkids].w);
811	+	}
812		free(kid); free(kidRow);
813		kid = NULL; kidRow = NULL;
719	–	rowsDone.NewBitMap(0);
814		RunChild();             // should never return
815		_exit(1);
816		}
#	Line 765 | Line 859 | RcontribSimulManager::SetThreadCount(int nt)
859		return 0;
860		}
861		if (nt < 0)
862	<	return nkids;
862	>	return NThreads();
863		if (!nt) nt = GetNCores();
864		int     status = 0;
865		if (nt == 1)
#	Line 778 | Line 872 | RcontribSimulManager::SetThreadCount(int nt)
872		sprintf(errmsg, "non-zero (%d) status from child", status);
873		error(WARNING, errmsg);
874		}
875	<	return nkids;
875	>	return NThreads();
876		}

Diff Legend

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