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.24 by greg, Sat Dec 12 23:08:13 2009 UTC vs.
Revision 2.26 by greg, Wed Dec 16 01:06:50 2009 UTC

# Line 71 | Line 71 | static const char      RCSid[] = "$Id$";
71   *
72   *  If the second argument is 1, the call won't block when
73   *  results aren't ready, but will immediately return 0.
74 *  (A special value of -1 returns 0 unless a ray is
75 *  ready in the queue and no system calls are needed.)
74   *  If the second argument is 0, the call will block
75   *  until a value is available, returning 0 only if the
76 < *  queue is completely empty.  A negative return value
76 > *  queue is completely empty.  Setting the second argument
77 > *  to -1 returns 0 unless a ray is ready in the queue and
78 > *  no system calls are needed.  A negative return value
79   *  indicates that a rendering process died.  If this
80   *  happens, ray_pclose(0) is automatically called to close
81   *  all child processes, and ray_pnprocs is set to zero.
# Line 88 | Line 88 | static const char      RCSid[] = "$Id$";
88   *              ray_psend(&myRay);
89   *      }
90   *
91 < *  Note that it is a fatal error to call ra_psend() when
92 < *  ray_pnidle is zero.  The ray_presult() and/or ray_pqueue()
93 < *  functions may be called subsequently to read back the results.
91 > *  Note that it is a mistake to call ra_psend() when
92 > *  ray_pnidle is zero, and nothing will be sent in
93 > *  this case.  Otherwise, the ray_presult() and/or ray_pqueue()
94 > *  functions may be called subsequently to read back the results
95 > *  of rays queued by ray_psend().
96   *
97   *  When you are done, you may call ray_pdone(1) to close
98   *  all child processes and clean up memory used by Radiance.
# Line 230 | Line 232 | ray_pflush(void)                       /* send queued rays to idle childre
232   }
233  
234  
235 < void
235 > int
236   ray_psend(                      /* add a ray to our send queue */
237          RAY     *r
238   )
239   {
240 <        if (r == NULL)
241 <                return;
240 >        int     rv;
241 >
242 >        if ((r == NULL) | (ray_pnidle <= 0))
243 >                return(0);
244                                          /* flush output if necessary */
245 <        if (sendq_full() && ray_pflush() <= 0)
246 <                error(INTERNAL, "ray_pflush failed in ray_psend()");
245 >        if (sendq_full() && (rv = ray_pflush()) <= 0)
246 >                return(rv);
247  
248          r_queue[r_send_next++] = *r;
249 +        return(1);
250   }
251  
252  
# Line 260 | Line 265 | ray_pqueue(                    /* queue a ray for computation */
265                          return(-1);
266                                          /* put new ray in queue */
267                  r_queue[r_send_next++] = mySend;
268 <                                /* XXX r_send_next may now be > RAYQLEN */
268 >
269                  return(1);
270          }
271                                          /* else add ray to send queue */
# Line 501 | Line 506 | ray_pclose(            /* close one or more child processes */
506          if (inclose)
507                  return;
508          inclose++;
509 +                                        /* check no child / in child */
510 +        if (ray_pnprocs <= 0)
511 +                return;
512                                          /* check argument */
513          if ((nsub <= 0) | (nsub > ray_pnprocs))
514                  nsub = ray_pnprocs;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines