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.18 by greg, Fri Feb 8 18:27:31 2008 UTC vs.
Revision 2.19 by greg, Wed Feb 20 05:21:29 2008 UTC

# Line 257 | 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;
261 <                int     rval;
262 <                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 293 | 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);
296                  return(1);
297          }
298          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */

Diff Legend

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