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.13 by greg, Thu Oct 16 23:14:31 2025 UTC vs.
Revision 2.21 by greg, Mon Oct 27 18:38:32 2025 UTC

#	Line 52 | Line 52 | struct RowAssignment {
52		uint32                  ac;             // accumulation count
53		};
54
55	<	// Get format identifier
56	<	const char *
57	<	formstr(int f)
58	<	{
59	<	switch (f) {
60	<	case 'a': return("ascii");
61	<	case 'f': return("float");
62	<	case 'd': return("double");
63	<	case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT);
64	<	}
65	<	return("unknown");
66	<	}
55	>	static const char       ROW_DONE[] = "ROW FINISHED\n";
56
57	<	// Our default data share function
58	<	RdataShare *
70	<	defDataShare(const char *name, RCOutputOp op, size_t siz)
71	<	{
72	<	return new RdataShareMap(name, RSDOflags[op], siz);
73	<	}
74	<
75	<	// Allocate rcontrib accumulator
76	<	RcontribMod *
57	>	// allocate rcontrib accumulator
58	>	static RcontribMod *
59		NewRcMod(const char *prms, const char *binexpr, int ncbins)
60		{
61	+	if (binexpr && !*binexpr) binexpr = NULL;
62		if (!prms) prms = "";
63		if ((ncbins > 1) & !binexpr) {
64		error(USER, "missing bin expression");
#	Line 110 | Line 93 | NewRcMod(const char *prms, const char *binexpr, int nc
93		return mp;
94		}
95
96	<	// Free an RcontribMod
96	>	// Free an RcontribMod (public for RcontribSimulManager constructor)
97		void
98		FreeRcMod(void *p)
99		{
#	Line 120 | Line 103 | FreeRcMod(void *p)
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	+	RdataShare *    rds = new RdataShareFile(name, RSDOflags[op],
129	+	siz*(op != RCOforce));
130	+
131	+	if (!rds || (op == RCOforce && rds->Resize(siz) < siz)) {
132	+	delete rds;
133	+	sprintf(errmsg, "cannot create %lu byte output file '%s'",
134	+	(unsigned long)siz, name);
135	+	error(SYSTEM, errmsg);
136	+	return NULL;
137	+	}
138	+	return rds;
139	+	}
140	+
141	+	// Memory-mapped data share function
142	+	RdataShare *
143	+	mapDataShare(const char *name, RCOutputOp op, size_t siz)
144	+	{
145	+	if (op == RCOrecover && access(name, R_OK|W_OK) < 0) {
146	+	sprintf(errmsg, "cannot recover from '%s'", name);
147	+	error(SYSTEM, errmsg);
148	+	return NULL;
149	+	}
150	+	RdataShare *    rds = new RdataShareMap(name, RSDOflags[op],
151	+	siz*(op != RCOforce));
152	+
153	+	if (!rds || (op == RCOforce && rds->Resize(siz) < siz)) {
154	+	delete rds;
155	+	sprintf(errmsg, "cannot create %lu byte output map '%s'",
156	+	(unsigned long)siz, name);
157	+	error(SYSTEM, errmsg);
158	+	return NULL;
159	+	}
160	+	return rds;
161	+	}
162	+
163		// Set output format ('f', 'd', or 'c')
164		bool
165		RcontribSimulManager::SetDataFormat(int ty)
#	Line 377 | Line 417 | RcontribSimulManager::PrepOutput()
417		if (rd < 0)
418		return -1;
419		if (rd >= op->nRows) {
420	<	if (remWarnings >= 0) {
420	>	if (remWarnings > 0) {
421		sprintf(errmsg, "recovered output '%s' is complete",
422		op->GetName());
423		error(WARNING, --remWarnings ? errmsg : "etc...");
#	Line 394 | Line 434 | RcontribSimulManager::PrepOutput()
434		}
435		rowsDone.NewBitMap(outList->nRows);     // create row completion map
436		rowsDone.ClearBits(0, rInPos, true);
437	<	return rInPos;
437	>	return nrDone = rInPos;
438		}
439
440		// Create header in open write-only channel
#	Line 429 | Line 469 | RcontribOutput::NewHeader(const RcontribSimulManager *
469		sprintf(hdr+begData, "%s%d\n", NCOMPSTR, NCSAMP);
470		begData += strlen(hdr+begData);
471		if (NCSAMP > 3) {
472	<	sprintf(hdr+begData, "%s %f %f %f %f\n", WLSPLTSTR,
472	>	sprintf(hdr+begData, "%s %g %g %g %g\n", WLSPLTSTR,
473		WLPART[0], WLPART[1], WLPART[2], WLPART[3]);
474		begData += strlen(hdr+begData);
475		}
#	Line 514 | Line 554 | RcontribOutput::CheckHeader(const RcontribSimulManager
554		return -1;
555		}
556		// check #columns
557	<	if (((cp = findArgs(hdr, "NCOLS=", begData)) && atoi(cp)*esiz != rowBytes) ||
558	<	!rcp->xres | (rowBytes > esiz)) {
559	<	sprintf(errmsg, "expected NCOLS=%d in '%s'",
520	<	int(rowBytes/esiz), GetName());
557	>	if ((cp = findArgs(hdr, "NCOLS=", begData)) ? (atoi(cp)*esiz != rowBytes)
558	>	: (!rcp->xres | (rowBytes > esiz))) {
559	>	sprintf(errmsg, "expected NCOLS=%d in '%s'", int(rowBytes/esiz), GetName());
560		error(USER, errmsg);
561		return -1;
562		}
#	Line 559 | Line 598 | RcontribSimulManager::ResetRow(int r)
598		return false;
599
600		rowsDone.ClearBits(r, rInPos-r, false);
601	<	rInPos = r;
601	>	nrDone = rInPos = r;
602		return true;
603		}
604
#	Line 625 | Line 664 | RcontribSimulManager::ComputeRecord(const FVECT orig_d
664		return 0;
665		}
666		if (nkids > 0) {                        // in parent process?
667	<	int     k = GetChild();         // updates output rows
668	<	if (k < 0) return -1;           // can't really happen
667	>	int     k = GetChild(false);    // updates output rows
668	>	if (k < 0) return -1;           // someone died?
669		RowAssignment   rass;
670		rass.row = kidRow[k] = rInPos++;
671		rass.ac = accum;
#	Line 671 | Line 710 | RcontribSimulManager::GetChild(bool forceWait)
710		return -1;
711		// take inventory
712		int     pn, n = 0;
713	<	fd_set  writeset, errset;
714	<	FD_ZERO(&writeset); FD_ZERO(&errset);
713	>	fd_set  readset, errset;
714	>	FD_ZERO(&readset); FD_ZERO(&errset);
715		for (pn = nkids; pn--; ) {
716		if (kidRow[pn] < 0) {           // child already ready?
717		if (forceWait) continue;
718		return pn;              // good enough
719		}
720	<	FD_SET(kid[pn].w, &writeset);   // will check on this one
721	<	FD_SET(kid[pn].w, &errset);
722	<	if (kid[pn].w >= n)
723	<	n = kid[pn].w + 1;
720	>	FD_SET(kid[pn].r, &readset);    // will check on this one
721	>	FD_SET(kid[pn].r, &errset);
722	>	if (kid[pn].r >= n)
723	>	n = kid[pn].r + 1;
724		}
725		if (!n)                                 // every child is idle?
726		return -1;
727		// wait on "busy" child(ren)
728	<	while ((n = select(n, NULL, &writeset, &errset, NULL)) <= 0)
728	>	while ((n = select(n, &readset, NULL, &errset, NULL)) <= 0)
729		if (errno != EINTR) {
730		error(SYSTEM, "select call failed in GetChild()");
731		return -1;
732		}
733	+	char    buf[sizeof(ROW_DONE)] = "X";
734		pn = -1;                                // get flags set by select
735		for (n = nkids; n--; )
736		if (kidRow[n] >= 0 &&
737	<	FD_ISSET(kid[n].w, &writeset) |
738	<	FD_ISSET(kid[n].w, &errset)) {
737	>	FD_ISSET(kid[n].r, &readset) |
738	>	FD_ISSET(kid[n].r, &errset)) {
739	>	// check for error
740	>	if (FD_ISSET(kid[n].r, &errset) ||
741	>	read(kid[n].r, buf, sizeof(ROW_DONE)) <= 0 ||
742	>	memcmp(buf, ROW_DONE, sizeof(ROW_DONE)))
743	>	return -1;
744		// update output row counts
745	<	if (!FD_ISSET(kid[n].w, &errset))
746	<	UpdateRowsDone(kidRow[n]);
702	<	kidRow[n] = -1;         // flag it available
745	>	UpdateRowsDone(kidRow[n]);
746	>	kidRow[n] = -1;         // flag child available
747		pn = n;
748		}
749		return pn;
#	Line 713 | Line 757 | RcontribSimulManager::UpdateRowsDone(int r)
757		error(WARNING, "redundant call to UpdateRowsDone()");
758		return false;
759		}
760	<	int     nDone = GetRowFinished();
761	<	if (nDone <= r)
760	>	GetRowFinished();
761	>	if (nrDone <= r)
762		return true;                    // nothing to update, yet
763		for (RcontribOutput *op = outList; op; op = op->next)
764	<	if (!op->SetRowsDone(nDone))
764	>	if (!op->SetRowsDone(nrDone))
765		return false;
766		return true;                            // up-to-date
767		}
#	Line 750 | Line 794 | RcontribSimulManager::RunChild()
794
795		if (ComputeRecord(vecList) <= 0)
796		exit(1);
797	+	// signal this row is done
798	+	if (write(1, ROW_DONE, sizeof(ROW_DONE)) != sizeof(ROW_DONE))
799	+	exit(1);
800		}
801		if (nr) {
802		error(SYSTEM, "read error in child process");
#	Line 775 | Line 822 | RcontribSimulManager::StartKids(int n2go)
822		fflush(stdout);                         // shouldn't use, anyway
823		while (nkids < n2go) {
824		kid[nkids] = sp_inactive;
778	–	kid[nkids].w = dup(1);
779	–	kid[nkids].flags |= PF_FILT_OUT;
825		int     rv = open_process(&kid[nkids], NULL);
826		if (!rv) {                      // in child process?
827	<	while (nkids-- > 0)
827	>	while (nkids-- > 0) {
828	>	close(kid[nkids].r);
829		close(kid[nkids].w);
830	+	}
831		free(kid); free(kidRow);
832		kid = NULL; kidRow = NULL;
833		RunChild();             // should never return

Diff Legend

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