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.12 by greg, Sat Dec 17 22:17:51 2005 UTC vs.
Revision 2.19 by greg, Wed Feb 20 05:21:29 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 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 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 <                r_send_next++;
267 <                return(rval);           /* done */
265 >                r_queue[r_send_next++] = mySend;
266 >                                /* XXX r_send_next may now be > RAYQLEN */
267 >                return(1);
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];
299 <                r_recv_first++;
295 >                *r = r_queue[r_recv_first++];
296                  return(1);
297          }
298          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
# Line 310 | 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 370 | Line 369 | getready:                              /* any children waiting for us? */
369                  rp->slights = NULL;
370          }
371                                          /* return first ray received */
372 <        *r = r_queue[r_recv_first];
374 <        r_recv_first++;
372 >        *r = r_queue[r_recv_first++];
373          return(1);
374   }
375  
# Line 399 | 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 447 | Line 447 | ray_popen(                     /* open the specified # processes */
447                  nadd = MAX_NPROCS - ray_pnprocs;
448          if (nadd <= 0)
449                  return;
450 <        fflush(stderr);                 /* clear pending output */
451 <        fflush(stdout);
450 >        ambsync();                      /* load any new ambient values */
451 >        fflush(NULL);                   /* clear pending output */
452          while (nadd--) {                /* fork each new process */
453                  int     p0[2], p1[2];
454                  if (pipe(p0) < 0 || pipe(p1) < 0)
# Line 522 | 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