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.28 by greg, Sat Aug 20 18:23:38 2011 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 174 | Line 176 | static int     r_send_next = 0;        /* next send ray placement
176   static int      r_recv_first = RAYQLEN; /* position of first unreported ray */
177   static int      r_recv_next = RAYQLEN;  /* next received ray placement */
178  
179 + static int      samplestep = 1;         /* sample step size */
180 +
181   #define sendq_full()    (r_send_next >= RAYQLEN)
182  
183   static int ray_pflush(void);
# Line 230 | Line 234 | ray_pflush(void)                       /* send queued rays to idle childre
234   }
235  
236  
237 < void
237 > int
238   ray_psend(                      /* add a ray to our send queue */
239          RAY     *r
240   )
241   {
242 <        if (r == NULL)
243 <                return;
242 >        int     rv;
243 >
244 >        if ((r == NULL) | (ray_pnidle <= 0))
245 >                return(0);
246                                          /* flush output if necessary */
247 <        if (sendq_full() && ray_pflush() <= 0)
248 <                error(INTERNAL, "ray_pflush failed in ray_psend()");
247 >        if (sendq_full() && (rv = ray_pflush()) <= 0)
248 >                return(rv);
249  
250          r_queue[r_send_next++] = *r;
251 +        return(1);
252   }
253  
254  
# Line 260 | Line 267 | ray_pqueue(                    /* queue a ray for computation */
267                          return(-1);
268                                          /* put new ray in queue */
269                  r_queue[r_send_next++] = mySend;
270 <                                /* XXX r_send_next may now be > RAYQLEN */
270 >
271                  return(1);
272          }
273                                          /* else add ray to send queue */
# Line 423 | Line 430 | ray_pchild(    /* process rays (never returns) */
430                          r_queue[i].clipset = NULL;
431                          r_queue[i].slights = NULL;
432                          r_queue[i].rlvl = 0;
433 <                        samplendx++;
433 >                        samplendx += samplestep;
434                          rayclear(&r_queue[i]);
435                          rayvalue(&r_queue[i]);
436                  }
# Line 457 | Line 464 | ray_popen(                     /* open the specified # processes */
464                  strcpy(shm_boundary, "SHM_BOUNDARY");
465          }
466          fflush(NULL);                   /* clear pending output */
467 +        samplestep = ray_pnprocs + nadd;
468          while (nadd--) {                /* fork each new process */
469                  int     p0[2], p1[2];
470                  if (pipe(p0) < 0 || pipe(p1) < 0)
# Line 475 | Line 483 | ray_popen(                     /* open the specified # processes */
483                  if (r_proc[ray_pnprocs].pid < 0)
484                          error(SYSTEM, "cannot fork child process");
485                  close(p1[0]); close(p0[1]);
486 +                if (rand_samp)          /* decorrelate random sequence */
487 +                        srandom(random());
488 +                else
489 +                        samplendx++;
490                  /*
491                   * Close write stream on exec to avoid multiprocessing deadlock.
492                   * No use in read stream without it, so set flag there as well.
# Line 501 | Line 513 | ray_pclose(            /* close one or more child processes */
513          if (inclose)
514                  return;
515          inclose++;
516 +                                        /* check no child / in child */
517 +        if (ray_pnprocs <= 0)
518 +                return;
519                                          /* check argument */
520          if ((nsub <= 0) | (nsub > ray_pnprocs))
521                  nsub = ray_pnprocs;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines