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.19 by greg, Wed Feb 20 05:21:29 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 259 | Line 257 | ray_pqueue(                    /* queue a ray for computation */
257                  return(0);
258                                          /* check for full send queue */
259          if (sendq_full()) {
260 <                RAY     mySend;
263 <                int     rval;
264 <                mySend = *r;
260 >                RAY     mySend = *r;
261                                          /* wait for a result */
262 <                rval = ray_presult(r, 0);
262 >                if (ray_presult(r, 0) <= 0)
263 >                        return(-1);
264                                          /* put new ray in queue */
265                  r_queue[r_send_next++] = mySend;
266 <                return(rval);           /* done */
266 >                                /* XXX r_send_next may now be > RAYQLEN */
267 >                return(1);
268          }
269                                          /* else add ray to send queue */
270          r_queue[r_send_next++] = *r;
# Line 308 | Line 306 | ray_presult(           /* check for a completed ray */
306                  n = ray_pnprocs - ray_pnidle;
307          if (n <= 0)                     /* return if nothing to await */
308                  return(0);
309 +        if (!poll && ray_pnprocs == 1)  /* one process -> skip select() */
310 +                FD_SET(r_proc[0].fd_recv, &readset);
311 +
312   getready:                               /* any children waiting for us? */
313          for (pn = ray_pnprocs; pn--; )
314                  if (FD_ISSET(r_proc[pn].fd_recv, &readset) ||
# Line 396 | Line 397 | ray_pchild(    /* process rays (never returns) */
397   {
398          int     n;
399          register int    i;
400 +                                        /* flag child process for quit() */
401 +        ray_pnprocs = -1;
402                                          /* read each ray request set */
403          while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
404                  int     n2;
# Line 519 | Line 522 | void
522   quit(ec)                        /* make sure exit is called */
523   int     ec;
524   {
525 +        if (ray_pnprocs > 0)    /* close children if any */
526 +                ray_pclose(0);          
527          exit(ec);
528   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines