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.18 by greg, Fri Feb 8 18:27:31 2008 UTC

# Line 131 | Line 131 | static const char      RCSid[] = "$Id$";
131   *  process should not be compromised.
132   */
133  
134 #include <stdio.h>
135 #include <sys/types.h>
136 #include <sys/wait.h> /* XXX platform */
137
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 295 | Line 293 | ray_presult(           /* check for a completed ray */
293                                          /* check queued results first */
294          if (r_recv_first < r_recv_next) {
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 308 | 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 396 | 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 519 | 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