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.13 by greg, Tue Dec 20 20:36:44 2005 UTC vs.
Revision 2.22 by greg, Sat Dec 12 05:20:10 2009 UTC

# Line 13 | Line 13 | static const char      RCSid[] = "$Id$";
13   *  These calls are designed similarly to the ones in raycalls.c,
14   *  but allow for multiple rendering processes on the same host
15   *  machine.  There is no sense in specifying more child processes
16 < *  than you have processors, but one child may help by allowing
16 > *  than you have processor cores, but one child may help by allowing
17   *  asynchronous ray computation in an interactive program, and
18   *  will protect the caller from fatal rendering errors.
19   *
20 < *  You should first read and undrstand the header in raycalls.c,
20 > *  You should first read and understand the header in raycalls.c,
21   *  as some things are explained there that are not repated here.
22   *
23   *  The first step is opening one or more rendering processes
# Line 25 | Line 25 | static const char      RCSid[] = "$Id$";
25   *  ray_pinit() loads the octree and data structures into the
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
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
30 > *  between processes.  Rays are traced using a simple
31   *  queuing mechanism, explained below.
32   *
33 < *  The ray queue holds at least RAYQLEN rays, up to
34 < *  as many rays as there are rendering processes.
33 > *  The ray queue buffers RAYQLEN rays before sending to
34 > *  children, each of which may internally buffer RAYQLEN rays
35 > *  during evaluation.  Rays are not returned in the order
36 > *  they are sent when multiple processes are open.
37 > *
38   *  Rays are queued and returned by a single
39   *  ray_pqueue() call.  A ray_pqueue() return
40   *  value of 0 indicates that no rays are ready
# Line 72 | Line 75 | static const char      RCSid[] = "$Id$";
75   *  until a value is available, returning 0 only if the
76   *  queue is completely empty.  A negative return value
77   *  indicates that a rendering process died.  If this
78 < *  happens, ray_close(0) is automatically called to close
78 > *  happens, ray_pclose(0) is automatically called to close
79   *  all child processes, and ray_pnprocs is set to zero.
80   *
81   *  If you just want to fill the ray queue without checking for
# Line 92 | Line 95 | static const char      RCSid[] = "$Id$";
95   *  Any queued ray calculations will be awaited and discarded.
96   *  As with ray_done(), ray_pdone(0) hangs onto data files
97   *  and fonts that are likely to be used in subsequent renderings.
98 < *  Whether you want to bother cleaning up memory or not, you
99 < *  should at least call ray_pclose(0) to clean the child processes.
98 > *  Whether you need to clean up memory or not, you should
99 > *  at least call ray_pclose(0) to await the child processes.
100   *
101   *  Warning:  You cannot affect any of the rendering processes
102   *  by changing global parameter values onece ray_pinit() has
# Line 123 | Line 126 | static const char      RCSid[] = "$Id$";
126   *  returning a negative value from ray_pqueue() or
127   *  ray_presult().  If you get a negative value from either
128   *  of these calls, you can assume that the processes have
129 < *  been cleaned up with a call to ray_close(), though you
129 > *  been cleaned up with a call to ray_pclose(), though you
130   *  will have to call ray_pdone() yourself if you want to
131   *  free memory.  Obviously, you cannot continue rendering
132   *  without risking further errors, but otherwise your
133   *  process should not be compromised.
134   */
135  
133 – #include <stdio.h>
134 – #include <sys/types.h>
135 – #include <sys/wait.h> /* XXX platform */
136 –
136   #include  "rtprocess.h"
137   #include  "ray.h"
138   #include  "ambient.h"
139 + #include  <sys/types.h>
140 + #include  <sys/wait.h>
141   #include  "selcall.h"
142  
143   #ifndef RAYQLEN
# Line 161 | Line 162 | static struct child_proc {
162          int     fd_send;                        /* write to child here */
163          int     fd_recv;                        /* read from child here */
164          int     npending;                       /* # rays in process */
165 <        unsigned long  rno[RAYQLEN];            /* working on these rays */
165 >        RNUMBER rno[RAYQLEN];                   /* working on these rays */
166   } r_proc[MAX_NPROCS];                   /* our child processes */
167  
168   static RAY      r_queue[2*RAYQLEN];     /* ray i/o buffer */
169   static int      r_send_next;            /* next send ray placement */
170   static int      r_recv_first;           /* position of first unreported ray */
171 < static int      r_recv_next;            /* next receive ray placement */
171 > static int      r_recv_next;            /* next received ray placement */
172  
173   #define sendq_full()    (r_send_next >= RAYQLEN)
174  
# Line 175 | Line 176 | static int ray_pflush(void);
176   static void ray_pchild(int fd_in, int fd_out);
177  
178  
179 < extern void
179 > void
180   ray_pinit(              /* initialize ray-tracing processes */
181          char    *otnm,
182          int     nproc
# Line 186 | Line 187 | ray_pinit(             /* initialize ray-tracing processes */
187  
188          ray_init(otnm);                 /* load the shared scene */
189  
189 –        preload_objs();                 /* preload auxiliary data */
190 –
191 –                                        /* set shared memory boundary */
192 –        shm_boundary = (char *)malloc(16);
193 –        strcpy(shm_boundary, "SHM_BOUNDARY");
194 –
190          r_send_next = 0;                /* set up queue */
191          r_recv_first = r_recv_next = RAYQLEN;
192  
# Line 234 | Line 229 | ray_pflush(void)                       /* send queued rays to idle childre
229   }
230  
231  
232 < extern void
232 > void
233   ray_psend(                      /* add a ray to our send queue */
234          RAY     *r
235   )
# Line 245 | Line 240 | ray_psend(                     /* add a ray to our send queue */
240          if (sendq_full() && ray_pflush() <= 0)
241                  error(INTERNAL, "ray_pflush failed in ray_psend");
242  
243 <        r_queue[r_send_next] = *r;
249 <        r_send_next++;
243 >        r_queue[r_send_next++] = *r;
244   }
245  
246  
247 < extern int
247 > int
248   ray_pqueue(                     /* queue a ray for computation */
249          RAY     *r
250   )
# Line 259 | Line 253 | ray_pqueue(                    /* queue a ray for computation */
253                  return(0);
254                                          /* check for full send queue */
255          if (sendq_full()) {
256 <                RAY     mySend;
263 <                int     rval;
264 <                mySend = *r;
256 >                RAY     mySend = *r;
257                                          /* wait for a result */
258 <                rval = ray_presult(r, 0);
258 >                if (ray_presult(r, 0) <= 0)
259 >                        return(-1);
260                                          /* put new ray in queue */
261 <                r_queue[r_send_next] = mySend;
262 <                r_send_next++;
263 <                return(rval);           /* done */
261 >                r_queue[r_send_next++] = mySend;
262 >                                /* XXX r_send_next may now be > RAYQLEN */
263 >                return(1);
264          }
265                                          /* else add ray to send queue */
266 <        r_queue[r_send_next] = *r;
274 <        r_send_next++;
266 >        r_queue[r_send_next++] = *r;
267                                          /* check for returned ray... */
268          if (r_recv_first >= r_recv_next)
269                  return(0);
270                                          /* ...one is sitting in queue */
271 <        *r = r_queue[r_recv_first];
280 <        r_recv_first++;
271 >        *r = r_queue[r_recv_first++];
272          return(1);
273   }
274  
275  
276 < extern int
276 > int
277   ray_presult(            /* check for a completed ray */
278          RAY     *r,
279          int     poll
# Line 297 | Line 288 | ray_presult(           /* check for a completed ray */
288                  return(0);
289                                          /* check queued results first */
290          if (r_recv_first < r_recv_next) {
291 <                *r = r_queue[r_recv_first];
301 <                r_recv_first++;
291 >                *r = r_queue[r_recv_first++];
292                  return(1);
293          }
294          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
# Line 312 | Line 302 | ray_presult(           /* check for a completed ray */
302                  n = ray_pnprocs - ray_pnidle;
303          if (n <= 0)                     /* return if nothing to await */
304                  return(0);
305 +        if (!poll && ray_pnprocs == 1)  /* one process -> skip select() */
306 +                FD_SET(r_proc[0].fd_recv, &readset);
307 +
308   getready:                               /* any children waiting for us? */
309          for (pn = ray_pnprocs; pn--; )
310                  if (FD_ISSET(r_proc[pn].fd_recv, &readset) ||
311                                  FD_ISSET(r_proc[pn].fd_recv, &errset))
312                          break;
313 <                                        /* call select if we must */
313 >                                        /* call select() if we must */
314          if (pn < 0) {
315                  FD_ZERO(&readset); FD_ZERO(&errset); n = 0;
316                  for (pn = ray_pnprocs; pn--; ) {
# Line 377 | Line 370 | getready:                              /* any children waiting for us? */
370   }
371  
372  
373 < extern void
373 > void
374   ray_pdone(              /* reap children and free data */
375          int     freall
376   )
# Line 400 | Line 393 | ray_pchild(    /* process rays (never returns) */
393   {
394          int     n;
395          register int    i;
396 +                                        /* flag child process for quit() */
397 +        ray_pnprocs = -1;
398                                          /* read each ray request set */
399          while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
400                  int     n2;
# Line 422 | Line 417 | ray_pchild(    /* process rays (never returns) */
417                          r_queue[i].parent = NULL;
418                          r_queue[i].clipset = NULL;
419                          r_queue[i].slights = NULL;
420 +                        r_queue[i].rlvl = 0;
421                          samplendx++;
422                          rayclear(&r_queue[i]);
423                          rayvalue(&r_queue[i]);
# Line 438 | Line 434 | ray_pchild(    /* process rays (never returns) */
434   }
435  
436  
437 < extern void
437 > void
438   ray_popen(                      /* open the specified # processes */
439          int     nadd
440   )
# Line 449 | Line 445 | ray_popen(                     /* open the specified # processes */
445          if (nadd <= 0)
446                  return;
447          ambsync();                      /* load any new ambient values */
448 +        if (shm_boundary == NULL) {     /* first child process? */
449 +                preload_objs();         /* preload auxiliary data */
450 +                                        /* set shared memory boundary */
451 +                shm_boundary = (char *)malloc(16);
452 +                strcpy(shm_boundary, "SHM_BOUNDARY");
453 +        }
454          fflush(NULL);                   /* clear pending output */
455          while (nadd--) {                /* fork each new process */
456                  int     p0[2], p1[2];
# Line 482 | Line 484 | ray_popen(                     /* open the specified # processes */
484   }
485  
486  
487 < extern void
487 > void
488   ray_pclose(             /* close one or more child processes */
489          int     nsub
490   )
# 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