ViewVC Help

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

root/Development/ray/src/rt/raypcalls.c

Comparing ray/src/rt/raypcalls.c (file contents):
Revision 2.28 by greg, Sat Aug 20 18:23:38 2011 UTC vs.
Revision 2.33 by greg, Mon Jun 15 15:44:03 2020 UTC

#	Line 147 | Line 147 | static const char      RCSid[] = "$Id$";
147		#include  "selcall.h"
148
149		#ifndef RAYQLEN
150	<	#define RAYQLEN         12              /* # rays to send at once */
150	>	#define RAYQLEN         24              /* # rays to send at once */
151		#endif
152
153		#ifndef MAX_RPROCS
#	Line 162 | Line 162 | extern char    *shm_boundary;          /* boundary of shared memo
162
163		int             ray_pnprocs = 0;        /* number of child processes */
164		int             ray_pnidle = 0;         /* number of idle children */
165	+	int             ray_pnbatch = 0;        /* throughput over responsiveness? */
166
167		static struct child_proc {
168	<	int     pid;                            /* child process id */
168	>	RT_PID  pid;                            /* child process id */
169		int     fd_send;                        /* write to child here */
170		int     fd_recv;                        /* read from child here */
171		int     npending;                       /* # rays in process */
#	Line 212 | Line 213 | ray_pflush(void)                       /* send queued rays to idle childre
213		for (i = ray_pnprocs; nc && i--; ) {
214		if (r_proc[i].npending > 0)
215		continue;       /* child looks busy */
216	<	n = (r_send_next - sfirst)/nc--;
216	>	n = r_send_next - sfirst;
217	>	if (ray_pnbatch)
218	>	nc--;           /* maximize bundling for batch calc */
219	>	else
220	>	n /= nc--;      /* distribute work for interactivity */
221		if (!n)
222		continue;
223		/* smuggle set size in crtype */
#	Line 290 | Line 295 | ray_presult(           /* check for a completed ray */
295		static struct timeval   tpoll;  /* zero timeval struct */
296		static fd_set   readset, errset;
297		int     n, ok;
298	<	register int    pn;
298	>	int     pn;
299
300		if (r == NULL)
301		return(0);
#	Line 368 | Line 373 | getready:                              /* any children waiting for us? */
373		}
374		/* preen returned rays */
375		for (n = r_recv_next - r_recv_first; n--; ) {
376	<	register RAY    *rp = &r_queue[r_recv_first + n];
376	>	RAY     *rp = &r_queue[r_recv_first + n];
377		rp->rno = r_proc[pn].rno[n];
378		rp->parent = NULL;
379		rp->newcset = rp->clipset = NULL;
#	Line 404 | Line 409 | ray_pchild(    /* process rays (never returns) */
409		)
410		{
411		int     n;
412	<	register int    i;
412	>	int     i;
413		/* flag child process for quit() */
414		ray_pnprocs = -1;
415		/* read each ray request set */
#	Line 508 | Line 513 | ray_pclose(            /* close one or more child processes */
513		)
514		{
515		static int      inclose = 0;
516	<	RAY     res;
516	>	RAY             res;
517	>	int             i, status = 0;
518		/* check recursion */
519		if (inclose)
520		return;
#	Line 524 | Line 530 | ray_pclose(            /* close one or more child processes */
530		;
531		r_send_next = 0;                /* hard reset in case of error */
532		r_recv_first = r_recv_next = RAYQLEN;
533	<	/* clean up children */
534	<	while (nsub--) {
535	<	int     status;
536	<	ray_pnprocs--;
537	<	close(r_proc[ray_pnprocs].fd_send);
538	<	if (waitpid(r_proc[ray_pnprocs].pid, &status, 0) < 0)
533	>	/* close send pipes */
534	>	for (i = ray_pnprocs-nsub; i < ray_pnprocs; i++)
535	>	close(r_proc[i].fd_send);
536	>
537	>	if (nsub == 1) {                /* awaiting single process? */
538	>	if (waitpid(r_proc[ray_pnprocs-1].pid, &status, 0) < 0)
539		status = 127<<8;
540	<	close(r_proc[ray_pnprocs].fd_recv);
541	<	if (status) {
542	<	sprintf(errmsg,
543	<	"rendering process %d exited with code %d",
544	<	r_proc[ray_pnprocs].pid, status>>8);
545	<	error(WARNING, errmsg);
540	>	close(r_proc[ray_pnprocs-1].fd_recv);
541	>	} else                          /* else unordered wait */
542	>	for (i = 0; i < nsub; ) {
543	>	int     j, mystatus;
544	>	RT_PID  pid = wait(&mystatus);
545	>	for (j = ray_pnprocs-nsub; j < ray_pnprocs; j++)
546	>	if (r_proc[j].pid == pid) {
547	>	if (mystatus)
548	>	status = mystatus;
549	>	close(r_proc[j].fd_recv);
550	>	++i;
551	>	}
552		}
553	<	ray_pnidle--;
553	>	ray_pnprocs -= nsub;
554	>	ray_pnidle -= nsub;
555	>	if (status) {
556	>	sprintf(errmsg, "rendering process exited with code %d", status>>8);
557	>	error(WARNING, errmsg);
558		}
559		inclose--;
560		}

Diff Legend

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