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.23 by greg, Sat Dec 12 19:01:00 2009 UTC vs.
Revision 2.29 by greg, Fri Mar 4 02:48:14 2016 UTC

#	Line 71 | Line 71 | static const char      RCSid[] = "$Id$";
71		*
72		*  If the second argument is 1, the call won't block when
73		*  results aren't ready, but will immediately return 0.
74	–	*  (A special value of -1 returns 0 unless a ray is
75	–	*  ready in the queue and no system calls are needed.)
74		*  If the second argument is 0, the call will block
75		*  until a value is available, returning 0 only if the
76	<	*  queue is completely empty.  A negative return value
76	>	*  queue is completely empty.  Setting the second argument
77	>	*  to -1 returns 0 unless a ray is ready in the queue and
78	>	*  no system calls are needed.  A negative return value
79		*  indicates that a rendering process died.  If this
80		*  happens, ray_pclose(0) is automatically called to close
81		*  all child processes, and ray_pnprocs is set to zero.
#	Line 88 | Line 88 | static const char      RCSid[] = "$Id$";
88		*              ray_psend(&myRay);
89		*      }
90		*
91	<	*  Note that it is a fatal error to call ra_psend() when
92	<	*  ray_pnidle is zero.  The ray_presult() and/or ray_pqueue()
93	<	*  functions may be called subsequently to read back the results.
91	>	*  Note that it is a mistake to call ra_psend() when
92	>	*  ray_pnidle is zero, and nothing will be sent in
93	>	*  this case.  Otherwise, the ray_presult() and/or ray_pqueue()
94	>	*  functions may be called subsequently to read back the results
95	>	*  of rays queued by ray_psend().
96		*
97		*  When you are done, you may call ray_pdone(1) to close
98		*  all child processes and clean up memory used by Radiance.
#	Line 162 | Line 164 | int            ray_pnprocs = 0;        /* number of child processes */
164		int             ray_pnidle = 0;         /* number of idle children */
165
166		static struct child_proc {
167	<	int     pid;                            /* child process id */
167	>	RT_PID  pid;                            /* child process id */
168		int     fd_send;                        /* write to child here */
169		int     fd_recv;                        /* read from child here */
170		int     npending;                       /* # rays in process */
#	Line 174 | Line 176 | static int     r_send_next = 0;        /* next send ray placement
176		static int      r_recv_first = RAYQLEN; /* position of first unreported ray */
177		static int      r_recv_next = RAYQLEN;  /* next received ray placement */
178
179	+	static int      samplestep = 1;         /* sample step size */
180	+
181		#define sendq_full()    (r_send_next >= RAYQLEN)
182
183		static int ray_pflush(void);
#	Line 224 | Line 228 | ray_pflush(void)                       /* send queued rays to idle childre
228		ray_pnidle--;           /* now she's busy */
229		}
230		if (sfirst != r_send_next)
231	<	error(CONSISTENCY, "code screwup in ray_pflush");
231	>	error(CONSISTENCY, "code screwup in ray_pflush()");
232		r_send_next = 0;
233		return(sfirst);                 /* return total # sent */
234		}
235
236
237	<	void
237	>	int
238		ray_psend(                      /* add a ray to our send queue */
239		RAY     *r
240		)
241		{
242	<	if (r == NULL)
243	<	return;
242	>	int     rv;
243	>
244	>	if ((r == NULL) | (ray_pnidle <= 0))
245	>	return(0);
246		/* flush output if necessary */
247	<	if (sendq_full() && ray_pflush() <= 0)
248	<	error(INTERNAL, "ray_pflush failed in ray_psend");
247	>	if (sendq_full() && (rv = ray_pflush()) <= 0)
248	>	return(rv);
249
250		r_queue[r_send_next++] = *r;
251	+	return(1);
252		}
253
254
#	Line 260 | Line 267 | ray_pqueue(                    /* queue a ray for computation */
267		return(-1);
268		/* put new ray in queue */
269		r_queue[r_send_next++] = mySend;
270	<	/* XXX r_send_next may now be > RAYQLEN */
270	>
271		return(1);
272		}
273		/* else add ray to send queue */
#	Line 329 | Line 336 | getready:                              /* any children waiting for us? */
336		poll ? &tpoll : (struct timeval *)NULL)) < 0)
337		if (errno != EINTR) {
338		error(WARNING,
339	<	"select call failed in ray_presult");
339	>	"select call failed in ray_presult()");
340		ray_pclose(0);
341		return(-1);
342		}
#	Line 408 | Line 415 | ray_pchild(    /* process rays (never returns) */
415		/* get smuggled set length */
416		n2 = sizeof(RAY)*r_queue[0].crtype - n;
417		if (n2 < 0)
418	<	error(INTERNAL, "buffer over-read in ray_pchild");
418	>	error(INTERNAL, "buffer over-read in ray_pchild()");
419		if (n2 > 0) {           /* read the rest of the set */
420		i = readbuf(fd_in, (char *)r_queue + n, n2);
421		if (i != n2)
#	Line 423 | Line 430 | ray_pchild(    /* process rays (never returns) */
430		r_queue[i].clipset = NULL;
431		r_queue[i].slights = NULL;
432		r_queue[i].rlvl = 0;
433	<	samplendx++;
433	>	samplendx += samplestep;
434		rayclear(&r_queue[i]);
435		rayvalue(&r_queue[i]);
436		}
437		/* write back our results */
438		i = writebuf(fd_out, (char *)r_queue, sizeof(RAY)*n);
439		if (i != sizeof(RAY)*n)
440	<	error(SYSTEM, "write error in ray_pchild");
440	>	error(SYSTEM, "write error in ray_pchild()");
441		}
442		if (n)
443	<	error(SYSTEM, "read error in ray_pchild");
443	>	error(SYSTEM, "read error in ray_pchild()");
444		ambsync();
445		quit(0);                        /* normal exit */
446		}
#	Line 457 | Line 464 | ray_popen(                     /* open the specified # processes */
464		strcpy(shm_boundary, "SHM_BOUNDARY");
465		}
466		fflush(NULL);                   /* clear pending output */
467	+	samplestep = ray_pnprocs + nadd;
468		while (nadd--) {                /* fork each new process */
469		int     p0[2], p1[2];
470		if (pipe(p0) < 0 || pipe(p1) < 0)
#	Line 468 | Line 476 | ray_popen(                     /* open the specified # processes */
476		close(r_proc[pn].fd_recv);
477		}
478		close(p0[0]); close(p1[1]);
479	+	close(0);       /* don't share stdin */
480		/* following call never returns */
481		ray_pchild(p1[0], p0[1]);
482		}
483		if (r_proc[ray_pnprocs].pid < 0)
484		error(SYSTEM, "cannot fork child process");
485		close(p1[0]); close(p0[1]);
486	+	if (rand_samp)          /* decorrelate random sequence */
487	+	srandom(random());
488	+	else
489	+	samplendx++;
490		/*
491		* Close write stream on exec to avoid multiprocessing deadlock.
492		* No use in read stream without it, so set flag there as well.
#	Line 495 | Line 508 | ray_pclose(            /* close one or more child processes */
508		)
509		{
510		static int      inclose = 0;
511	<	RAY     res;
511	>	RAY             res;
512	>	int             i, status = 0;
513		/* check recursion */
514		if (inclose)
515		return;
516		inclose++;
517	+	/* check no child / in child */
518	+	if (ray_pnprocs <= 0)
519	+	return;
520		/* check argument */
521		if ((nsub <= 0) | (nsub > ray_pnprocs))
522		nsub = ray_pnprocs;
#	Line 508 | Line 525 | ray_pclose(            /* close one or more child processes */
525		;
526		r_send_next = 0;                /* hard reset in case of error */
527		r_recv_first = r_recv_next = RAYQLEN;
528	<	/* clean up children */
529	<	while (nsub--) {
530	<	int     status;
531	<	ray_pnprocs--;
532	<	close(r_proc[ray_pnprocs].fd_recv);
533	<	close(r_proc[ray_pnprocs].fd_send);
517	<	if (waitpid(r_proc[ray_pnprocs].pid, &status, 0) < 0)
528	>	/* close send pipes */
529	>	for (i = ray_pnprocs-nsub; i < ray_pnprocs; i++)
530	>	close(r_proc[i].fd_send);
531	>
532	>	if (nsub == 1) {                /* awaiting single process? */
533	>	if (waitpid(r_proc[ray_pnprocs-1].pid, &status, 0) < 0)
534		status = 127<<8;
535	<	if (status) {
536	<	sprintf(errmsg,
537	<	"rendering process %d exited with code %d",
538	<	r_proc[ray_pnprocs].pid, status>>8);
539	<	error(WARNING, errmsg);
535	>	close(r_proc[ray_pnprocs-1].fd_recv);
536	>	} else                          /* else unordered wait */
537	>	for (i = 0; i < nsub; ) {
538	>	int     j, mystatus;
539	>	RT_PID  pid = wait(&mystatus);
540	>	for (j = ray_pnprocs-nsub; j < ray_pnprocs; j++)
541	>	if (r_proc[j].pid == pid) {
542	>	if (mystatus)
543	>	status = mystatus;
544	>	close(r_proc[j].fd_recv);
545	>	++i;
546	>	}
547		}
548	<	ray_pnidle--;
548	>	ray_pnprocs -= nsub;
549	>	ray_pnidle -= nsub;
550	>	if (status) {
551	>	sprintf(errmsg, "rendering process exited with code %d", status>>8);
552	>	error(WARNING, errmsg);
553		}
554		inclose--;
555		}

Diff Legend

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