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.11 by greg, Thu Jan 2 16:16:49 2025 UTC vs.
Revision 2.14 by greg, Fri Oct 17 01:15:53 2025 UTC

#	Line 52 | Line 52 | struct RowAssignment {
52		uint32                  ac;             // accumulation count
53		};
54
55	+	static const char       ROW_DONE[] = "ROW FINISHED\n";
56	+
57		// Get format identifier
58		const char *
59		formstr(int f)
#	Line 215 | Line 217 | RcontribSimulManager::AddModifier(const char *modn, co
217		error(WARNING, "ignoring bad call to AddModifier()");
218		return false;
219		}
220	+	if (*outspec == '!') {
221	+	error(USER, "command output not supported by RcontribSimulManager");
222	+	return false;
223	+	}
224		if (!nChan) {                           // initial call?
225		if ((xres < 0) | (yres <= 0)) {
226		error(USER, "xres, yres must be set before first modifier");
#	Line 602 | Line 608 | putModContrib(const LUENT *lp, void *p)
608		}
609		} break;
610		default:
611	<	error(CONSISTENCY, "unsupported output type in sendModContrib()");
611	>	error(CONSISTENCY, "unsupported output type in putModContrib()");
612		return -1;
613		}
614		// clear for next tally
#	Line 621 | Line 627 | RcontribSimulManager::ComputeRecord(const FVECT orig_d
627		return 0;
628		}
629		if (nkids > 0) {                        // in parent process?
630	<	int     k = GetChild();         // updates output rows
631	<	if (k < 0) return -1;           // can't really happen
630	>	int     k = GetChild(false);    // updates output rows
631	>	if (k < 0) return -1;           // someone died?
632		RowAssignment   rass;
633		rass.row = kidRow[k] = rInPos++;
634		rass.ac = accum;
#	Line 667 | Line 673 | RcontribSimulManager::GetChild(bool forceWait)
673		return -1;
674		// take inventory
675		int     pn, n = 0;
676	<	fd_set  writeset, errset;
677	<	FD_ZERO(&writeset); FD_ZERO(&errset);
676	>	fd_set  readset, errset;
677	>	FD_ZERO(&readset); FD_ZERO(&errset);
678		for (pn = nkids; pn--; ) {
679		if (kidRow[pn] < 0) {           // child already ready?
680		if (forceWait) continue;
681		return pn;              // good enough
682		}
683	<	FD_SET(kid[pn].w, &writeset);   // will check on this one
684	<	FD_SET(kid[pn].w, &errset);
685	<	if (kid[pn].w >= n)
686	<	n = kid[pn].w + 1;
683	>	FD_SET(kid[pn].r, &readset);    // will check on this one
684	>	FD_SET(kid[pn].r, &errset);
685	>	if (kid[pn].r >= n)
686	>	n = kid[pn].r + 1;
687		}
688		if (!n)                                 // every child is idle?
689		return -1;
690		// wait on "busy" child(ren)
691	<	while ((n = select(n, NULL, &writeset, &errset, NULL)) <= 0)
691	>	while ((n = select(n, &readset, NULL, &errset, NULL)) <= 0)
692		if (errno != EINTR) {
693		error(SYSTEM, "select call failed in GetChild()");
694		return -1;
695		}
696	+	char    buf[sizeof(ROW_DONE)] = "X";
697		pn = -1;                                // get flags set by select
698		for (n = nkids; n--; )
699		if (kidRow[n] >= 0 &&
700	<	FD_ISSET(kid[n].w, &writeset) |
701	<	FD_ISSET(kid[n].w, &errset)) {
700	>	FD_ISSET(kid[n].r, &readset) |
701	>	FD_ISSET(kid[n].r, &errset)) {
702	>	// check for error
703	>	if (FD_ISSET(kid[n].r, &errset) ||
704	>	read(kid[n].r, buf, sizeof(ROW_DONE)) <= 0 ||
705	>	memcmp(buf, ROW_DONE, sizeof(ROW_DONE)))
706	>	return -1;
707		// update output row counts
708	<	if (!FD_ISSET(kid[n].w, &errset))
709	<	UpdateRowsDone(kidRow[n]);
698	<	kidRow[n] = -1;         // flag it available
708	>	UpdateRowsDone(kidRow[n]);
709	>	kidRow[n] = -1;         // flag child available
710		pn = n;
711		}
712		return pn;
#	Line 733 | Line 744 | RcontribSimulManager::RunChild()
744		error(CONSISTENCY, "bad accumulator count in child");
745		exit(1);
746		}
747	<	if (rass.ac > accum)
748	<	vecList = (FVECT *)erealloc(vecList,
749	<	sizeof(FVECT)*2*rass.ac);
747	>	if (rass.ac > accum) {
748	>	efree(vecList);
749	>	vecList = (FVECT *)emalloc(sizeof(FVECT)*2*rass.ac);
750	>	}
751		accum = rass.ac;
752		rInPos = rass.row;
753
#	Line 745 | Line 757 | RcontribSimulManager::RunChild()
757
758		if (ComputeRecord(vecList) <= 0)
759		exit(1);
760	+	// signal this row is done
761	+	if (write(1, ROW_DONE, sizeof(ROW_DONE)) != sizeof(ROW_DONE))
762	+	exit(1);
763		}
764		if (nr) {
765		error(SYSTEM, "read error in child process");
#	Line 770 | Line 785 | RcontribSimulManager::StartKids(int n2go)
785		fflush(stdout);                         // shouldn't use, anyway
786		while (nkids < n2go) {
787		kid[nkids] = sp_inactive;
773	–	kid[nkids].w = dup(1);
774	–	kid[nkids].flags |= PF_FILT_OUT;
788		int     rv = open_process(&kid[nkids], NULL);
789		if (!rv) {                      // in child process?
790	<	while (nkids-- > 0)
790	>	while (nkids-- > 0) {
791	>	close(kid[nkids].r);
792		close(kid[nkids].w);
793	+	}
794		free(kid); free(kidRow);
795		kid = NULL; kidRow = NULL;
796		RunChild();             // should never return

Diff Legend

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