ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.15 by greg, Wed Sep 12 03:57:00 2007 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 245 | Line 246 | ray_psend(                     /* add a ray to our send queue */
246          if (sendq_full() && ray_pflush() <= 0)
247                  error(INTERNAL, "ray_pflush failed in ray_psend");
248  
249 <        r_queue[r_send_next] = *r;
249 <        r_send_next++;
249 >        r_queue[r_send_next++] = *r;
250   }
251  
252  
# Line 265 | Line 265 | ray_pqueue(                    /* queue a ray for computation */
265                                          /* wait for a result */
266                  rval = ray_presult(r, 0);
267                                          /* put new ray in queue */
268 <                r_queue[r_send_next] = mySend;
269 <                r_send_next++;
268 >                r_queue[r_send_next++] = mySend;
269                  return(rval);           /* done */
270          }
271                                          /* else add ray to send queue */
272 <        r_queue[r_send_next] = *r;
274 <        r_send_next++;
272 >        r_queue[r_send_next++] = *r;
273                                          /* check for returned ray... */
274          if (r_recv_first >= r_recv_next)
275                  return(0);
276                                          /* ...one is sitting in queue */
277 <        *r = r_queue[r_recv_first];
280 <        r_recv_first++;
277 >        *r = r_queue[r_recv_first++];
278          return(1);
279   }
280  
# Line 297 | Line 294 | ray_presult(           /* check for a completed ray */
294                  return(0);
295                                          /* check queued results first */
296          if (r_recv_first < r_recv_next) {
297 <                *r = r_queue[r_recv_first];
301 <                r_recv_first++;
297 >                *r = r_queue[r_recv_first++];
298                  return(1);
299          }
300          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
# Line 400 | Line 396 | ray_pchild(    /* process rays (never returns) */
396   {
397          int     n;
398          register int    i;
399 +                                        /* flag child process for quit() */
400 +        ray_pnprocs = -1;
401                                          /* read each ray request set */
402          while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
403                  int     n2;
# Line 523 | Line 521 | void
521   quit(ec)                        /* make sure exit is called */
522   int     ec;
523   {
524 +        if (ray_pnprocs > 0)    /* close children if any */
525 +                ray_pclose(0);          
526          exit(ec);
527   }

Diff Legend

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