--- ray/src/rt/raypcalls.c	2005/12/21 17:36:06	2.14
+++ ray/src/rt/raypcalls.c	2008/12/02 23:28:34	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raypcalls.c,v 2.14 2005/12/21 17:36:06 greg Exp $";
+static const char	RCSid[] = "$Id: raypcalls.c,v 2.20 2008/12/02 23:28:34 greg Exp $";
 #endif
 /*
  *  raypcalls.c - interface for parallel rendering using Radiance
@@ -131,13 +131,11 @@ static const char	RCSid[] = "$Id: raypcalls.c,v 2.14 2
  *  process should not be compromised.
  */
 
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h> /* XXX platform */
-
 #include  "rtprocess.h"
 #include  "ray.h"
 #include  "ambient.h"
+#include  <sys/types.h>
+#include  <sys/wait.h>
 #include  "selcall.h"
 
 #ifndef RAYQLEN
@@ -187,12 +185,6 @@ ray_pinit(		/* initialize ray-tracing processes */
 
 	ray_init(otnm);			/* load the shared scene */
 
-	preload_objs();			/* preload auxiliary data */
-
-					/* set shared memory boundary */
-	shm_boundary = (char *)malloc(16);
-	strcpy(shm_boundary, "SHM_BOUNDARY");
-
 	r_send_next = 0;		/* set up queue */
 	r_recv_first = r_recv_next = RAYQLEN;
 
@@ -259,14 +251,14 @@ ray_pqueue(			/* queue a ray for computation */
 		return(0);
 					/* check for full send queue */
 	if (sendq_full()) {
-		RAY	mySend;
-		int	rval;
-		mySend = *r;
+		RAY	mySend = *r;
 					/* wait for a result */
-		rval = ray_presult(r, 0);
+		if (ray_presult(r, 0) <= 0)
+			return(-1);
 					/* put new ray in queue */
 		r_queue[r_send_next++] = mySend;
-		return(rval);		/* done */
+				/* XXX r_send_next may now be > RAYQLEN */
+		return(1);
 	}
 					/* else add ray to send queue */
 	r_queue[r_send_next++] = *r;
@@ -308,6 +300,9 @@ ray_presult(		/* check for a completed ray */
 		n = ray_pnprocs - ray_pnidle;
 	if (n <= 0)			/* return if nothing to await */
 		return(0);
+	if (!poll && ray_pnprocs == 1)	/* one process -> skip select() */
+		FD_SET(r_proc[0].fd_recv, &readset);
+
 getready:				/* any children waiting for us? */
 	for (pn = ray_pnprocs; pn--; )
 		if (FD_ISSET(r_proc[pn].fd_recv, &readset) ||
@@ -396,6 +391,8 @@ ray_pchild(	/* process rays (never returns) */
 {
 	int	n;
 	register int	i;
+					/* flag child process for quit() */
+	ray_pnprocs = -1;
 					/* read each ray request set */
 	while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
 		int	n2;
@@ -445,6 +442,12 @@ ray_popen(			/* open the specified # processes */
 	if (nadd <= 0)
 		return;
 	ambsync();			/* load any new ambient values */
+	if (shm_boundary == NULL) {	/* first child process? */
+		preload_objs();		/* preload auxiliary data */
+					/* set shared memory boundary */
+		shm_boundary = (char *)malloc(16);
+		strcpy(shm_boundary, "SHM_BOUNDARY");
+	}
 	fflush(NULL);			/* clear pending output */
 	while (nadd--) {		/* fork each new process */
 		int	p0[2], p1[2];
@@ -519,5 +522,7 @@ void
 quit(ec)			/* make sure exit is called */
 int	ec;
 {
+	if (ray_pnprocs > 0)	/* close children if any */
+		ray_pclose(0);		
 	exit(ec);
 }