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.10 by greg, Fri Apr 15 04:44:51 2005 UTC vs.
Revision 2.18 by greg, Fri Feb 8 18:27:31 2008 UTC

# Line 23 | Line 23 | static const char      RCSid[] = "$Id$";
23   *  The first step is opening one or more rendering processes
24   *  with a call to ray_pinit(oct, nproc).  Before calling fork(),
25   *  ray_pinit() loads the octree and data structures into the
26 < *  caller's memory.  This permits all sorts of queries that
27 < *  wouldn't be possible otherwise, without causing any real
26 > *  caller's memory, and ray_popen() synchronizes the ambient
27 > *  file, if any.  Shared memory permits all sorts of queries
28 > *  that wouldn't be possible otherwise, without causing any real
29   *  memory overhead, since all the static data are shared
30   *  between processes.  Rays are then traced using a simple
31   *  queuing mechanism, explained below.
32   *
33 < *  The ray queue holds as many rays as there are rendering
34 < *  processes.  Rays are queued and returned by a single
33 > *  The ray queue buffers RAYQLEN rays before sending to
34 > *  children, each of which may internally buffer RAYQLEN rays.
35 > *
36 > *  Rays are queued and returned by a single
37   *  ray_pqueue() call.  A ray_pqueue() return
38   *  value of 0 indicates that no rays are ready
39   *  and the queue is not yet full.  A return value of 1
# Line 43 | Line 46 | static const char      RCSid[] = "$Id$";
46   *      myRay.rorg = ( ray origin point )
47   *      myRay.rdir = ( normalized ray direction )
48   *      myRay.rmax = ( maximum length, or zero for no limit )
49 < *      rayorigin(&myRay, NULL, PRIMARY, 1.0);
49 > *      rayorigin(&myRay, PRIMARY, NULL, NULL);
50   *      myRay.rno = ( my personal ray identifier )
51   *      if (ray_pqueue(&myRay) == 1)
52   *              { do something with results }
# Line 105 | Line 108 | static const char      RCSid[] = "$Id$";
108   *  Note:  These routines are written to coordinate with the
109   *  definitions in raycalls.c, and in fact depend on them.
110   *  If you want to trace a ray and get a result synchronously,
111 < *  use the ray_trace() call to compute it in the parent process
111 > *  use the ray_trace() call to compute it in the parent process.
112   *  This will not interfere with any subprocess calculations,
113   *  but beware that a fatal error may end with a call to quit().
114   *
# Line 128 | Line 131 | static const char      RCSid[] = "$Id$";
131   *  process should not be compromised.
132   */
133  
131 – #include <stdio.h>
132 – #include <sys/types.h>
133 – #include <sys/wait.h> /* XXX platform */
134 –
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
142 < #define RAYQLEN         16              /* # rays to send at once */
142 > #define RAYQLEN         12              /* # rays to send at once */
143   #endif
144  
145   #ifndef MAX_RPROCS
# Line 170 | Line 171 | static int     r_recv_next;            /* next receive ray placement
171   #define sendq_full()    (r_send_next >= RAYQLEN)
172  
173   static int ray_pflush(void);
174 < static void ray_pchild(int      fd_in, int      fd_out);
174 > static void ray_pchild(int fd_in, int fd_out);
175  
176  
177   extern void
# Line 243 | Line 244 | ray_psend(                     /* add a ray to our send queue */
244          if (sendq_full() && ray_pflush() <= 0)
245                  error(INTERNAL, "ray_pflush failed in ray_psend");
246  
247 <        r_queue[r_send_next] = *r;
247 <        r_send_next++;
247 >        r_queue[r_send_next++] = *r;
248   }
249  
250  
# Line 263 | Line 263 | ray_pqueue(                    /* queue a ray for computation */
263                                          /* wait for a result */
264                  rval = ray_presult(r, 0);
265                                          /* put new ray in queue */
266 <                r_queue[r_send_next] = mySend;
267 <                r_send_next++;
266 >                r_queue[r_send_next++] = mySend;
267                  return(rval);           /* done */
268          }
269 <                                        /* add ray to send queue */
270 <        r_queue[r_send_next] = *r;
272 <        r_send_next++;
269 >                                        /* else add ray to send queue */
270 >        r_queue[r_send_next++] = *r;
271                                          /* check for returned ray... */
272          if (r_recv_first >= r_recv_next)
273                  return(0);
274                                          /* ...one is sitting in queue */
275 <        *r = r_queue[r_recv_first];
278 <        r_recv_first++;
275 >        *r = r_queue[r_recv_first++];
276          return(1);
277   }
278  
# Line 295 | Line 292 | ray_presult(           /* check for a completed ray */
292                  return(0);
293                                          /* check queued results first */
294          if (r_recv_first < r_recv_next) {
295 <                *r = r_queue[r_recv_first];
296 <                r_recv_first++;
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 310 | 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 370 | Line 372 | getready:                              /* any children waiting for us? */
372                  rp->slights = NULL;
373          }
374                                          /* return first ray received */
375 <        *r = r_queue[r_recv_first];
374 <        r_recv_first++;
375 >        *r = r_queue[r_recv_first++];
376          return(1);
377   }
378  
# Line 399 | 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;
408 <                if (n % sizeof(RAY))
408 >                if (n < sizeof(RAY))
409                          break;
407 –                n /= sizeof(RAY);
410                                          /* get smuggled set length */
411 <                n2 = r_queue[0].crtype - n;
411 >                n2 = sizeof(RAY)*r_queue[0].crtype - n;
412                  if (n2 < 0)
413                          error(INTERNAL, "buffer over-read in ray_pchild");
414                  if (n2 > 0) {           /* read the rest of the set */
415 <                        i = readbuf(fd_in, (char *)(r_queue+n),
416 <                                        sizeof(RAY)*n2);
415 <                        if (i != sizeof(RAY)*n2)
415 >                        i = readbuf(fd_in, (char *)r_queue + n, n2);
416 >                        if (i != n2)
417                                  break;
418                          n += n2;
419                  }
420 +                n /= sizeof(RAY);
421                                          /* evaluate rays */
422                  for (i = 0; i < n; i++) {
423                          r_queue[i].crtype = r_queue[i].rtype;
# Line 448 | Line 450 | ray_popen(                     /* open the specified # processes */
450                  nadd = MAX_NPROCS - ray_pnprocs;
451          if (nadd <= 0)
452                  return;
453 <        fflush(stderr);                 /* clear pending output */
454 <        fflush(stdout);
453 >        ambsync();                      /* load any new ambient values */
454 >        fflush(NULL);                   /* clear pending output */
455          while (nadd--) {                /* fork each new process */
456                  int     p0[2], p1[2];
457                  if (pipe(p0) < 0 || pipe(p1) < 0)
# Line 523 | 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