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.14 by greg, Wed Dec 21 17:36:06 2005 UTC vs.
Revision 2.17 by greg, Tue Sep 18 19:10:02 2007 UTC

# Line 295 | Line 295 | ray_presult(           /* check for a completed ray */
295                                          /* check queued results first */
296          if (r_recv_first < r_recv_next) {
297                  *r = r_queue[r_recv_first++];
298 +                                        /* make sure send queue has room */
299 +                if (sendq_full() && ray_pflush() <= 0)
300 +                        return(-1);
301                  return(1);
302          }
303          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
# Line 308 | Line 311 | ray_presult(           /* check for a completed ray */
311                  n = ray_pnprocs - ray_pnidle;
312          if (n <= 0)                     /* return if nothing to await */
313                  return(0);
314 +        if (!poll && ray_pnprocs == 1)  /* one process -> skip select() */
315 +                FD_SET(r_proc[0].fd_recv, &readset);
316 +
317   getready:                               /* any children waiting for us? */
318          for (pn = ray_pnprocs; pn--; )
319                  if (FD_ISSET(r_proc[pn].fd_recv, &readset) ||
# Line 396 | Line 402 | ray_pchild(    /* process rays (never returns) */
402   {
403          int     n;
404          register int    i;
405 +                                        /* flag child process for quit() */
406 +        ray_pnprocs = -1;
407                                          /* read each ray request set */
408          while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
409                  int     n2;
# Line 519 | Line 527 | void
527   quit(ec)                        /* make sure exit is called */
528   int     ec;
529   {
530 +        if (ray_pnprocs > 0)    /* close children if any */
531 +                ray_pclose(0);          
532          exit(ec);
533   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines