ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/raypcalls.c
(Generate patch)

Comparing ray/src/rt/raypcalls.c (file contents):
Revision 2.13 by greg, Tue Dec 20 20:36:44 2005 UTC vs.
Revision 2.18 by greg, Fri Feb 8 18:27:31 2008 UTC

# Line 30 | Line 30 | static const char      RCSid[] = "$Id$";
30   *  between processes.  Rays are then traced using a simple
31   *  queuing mechanism, explained below.
32   *
33 < *  The ray queue holds at least RAYQLEN rays, up to
34 < *  as many rays as there are rendering processes.
33 > *  The ray queue buffers RAYQLEN rays before sending to
34 > *  children, each of which may internally buffer RAYQLEN rays.
35 > *
36   *  Rays are queued and returned by a single
37   *  ray_pqueue() call.  A ray_pqueue() return
38   *  value of 0 indicates that no rays are ready
# Line 130 | Line 131 | static const char      RCSid[] = "$Id$";
131   *  process should not be compromised.
132   */
133  
133 #include <stdio.h>
134 #include <sys/types.h>
135 #include <sys/wait.h> /* XXX platform */
136
134   #include  "rtprocess.h"
135   #include  "ray.h"
136   #include  "ambient.h"
137 + #include  <sys/types.h>
138 + #include  <sys/wait.h>
139   #include  "selcall.h"
140  
141   #ifndef RAYQLEN
# Line 245 | Line 244 | ray_psend(                     /* add a ray to our send queue */
244          if (sendq_full() && ray_pflush() <= 0)
245                  error(INTERNAL, "ray_pflush failed in ray_psend");
246  
247 <        r_queue[r_send_next] = *r;
249 <        r_send_next++;
247 >        r_queue[r_send_next++] = *r;
248   }
249  
250  
# Line 265 | Line 263 | ray_pqueue(                    /* queue a ray for computation */
263                                          /* wait for a result */
264                  rval = ray_presult(r, 0);
265                                          /* put new ray in queue */
266 <                r_queue[r_send_next] = mySend;
269 <                r_send_next++;
266 >                r_queue[r_send_next++] = mySend;
267                  return(rval);           /* done */
268          }
269                                          /* else add ray to send queue */
270 <        r_queue[r_send_next] = *r;
274 <        r_send_next++;
270 >        r_queue[r_send_next++] = *r;
271                                          /* check for returned ray... */
272          if (r_recv_first >= r_recv_next)
273                  return(0);
274                                          /* ...one is sitting in queue */
275 <        *r = r_queue[r_recv_first];
280 <        r_recv_first++;
275 >        *r = r_queue[r_recv_first++];
276          return(1);
277   }
278  
# Line 297 | Line 292 | ray_presult(           /* check for a completed ray */
292                  return(0);
293                                          /* check queued results first */
294          if (r_recv_first < r_recv_next) {
295 <                *r = r_queue[r_recv_first];
296 <                r_recv_first++;
295 >                *r = r_queue[r_recv_first++];
296 >                                        /* make sure send queue has room */
297 >                if (sendq_full() && ray_pflush() <= 0)
298 >                        return(-1);
299                  return(1);
300          }
301          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
# Line 312 | Line 309 | ray_presult(           /* check for a completed ray */
309                  n = ray_pnprocs - ray_pnidle;
310          if (n <= 0)                     /* return if nothing to await */
311                  return(0);
312 +        if (!poll && ray_pnprocs == 1)  /* one process -> skip select() */
313 +                FD_SET(r_proc[0].fd_recv, &readset);
314 +
315   getready:                               /* any children waiting for us? */
316          for (pn = ray_pnprocs; pn--; )
317                  if (FD_ISSET(r_proc[pn].fd_recv, &readset) ||
# Line 400 | Line 400 | ray_pchild(    /* process rays (never returns) */
400   {
401          int     n;
402          register int    i;
403 +                                        /* flag child process for quit() */
404 +        ray_pnprocs = -1;
405                                          /* read each ray request set */
406          while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
407                  int     n2;
# Line 523 | Line 525 | void
525   quit(ec)                        /* make sure exit is called */
526   int     ec;
527   {
528 +        if (ray_pnprocs > 0)    /* close children if any */
529 +                ray_pclose(0);          
530          exit(ec);
531   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines