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.22 by greg, Sat Dec 12 05:20:10 2009 UTC vs.
Revision 2.23 by greg, Sat Dec 12 19:01:00 2009 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.)
76   *  If the second argument is 0, the call will block
77   *  until a value is available, returning 0 only if the
78   *  queue is completely empty.  A negative return value
# Line 97 | Line 99 | static const char      RCSid[] = "$Id$";
99   *  and fonts that are likely to be used in subsequent renderings.
100   *  Whether you need to clean up memory or not, you should
101   *  at least call ray_pclose(0) to await the child processes.
102 + *  The caller should define a quit() function that calls
103 + *  ray_pclose(0) if ray_pnprocs > 0.
104   *
105   *  Warning:  You cannot affect any of the rendering processes
106   *  by changing global parameter values onece ray_pinit() has
# Line 166 | Line 170 | static struct child_proc {
170   } r_proc[MAX_NPROCS];                   /* our child processes */
171  
172   static RAY      r_queue[2*RAYQLEN];     /* ray i/o buffer */
173 < static int      r_send_next;            /* next send ray placement */
174 < static int      r_recv_first;           /* position of first unreported ray */
175 < static int      r_recv_next;            /* next received ray placement */
173 > static int      r_send_next = 0;        /* next send ray placement */
174 > static int      r_recv_first = RAYQLEN; /* position of first unreported ray */
175 > static int      r_recv_next = RAYQLEN;  /* next received ray placement */
176  
177   #define sendq_full()    (r_send_next >= RAYQLEN)
178  
# Line 187 | Line 191 | ray_pinit(             /* initialize ray-tracing processes */
191  
192          ray_init(otnm);                 /* load the shared scene */
193  
190 –        r_send_next = 0;                /* set up queue */
191 –        r_recv_first = r_recv_next = RAYQLEN;
192 –
194          ray_popen(nproc);               /* fork children */
195   }
196  
# Line 291 | Line 292 | ray_presult(           /* check for a completed ray */
292                  *r = r_queue[r_recv_first++];
293                  return(1);
294          }
295 +        if (poll < 0)                   /* immediate polling mode? */
296 +                return(0);
297 +
298          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
299  
300          if (ray_pflush() < 0)           /* send new rays to process */
# Line 381 | Line 385 | ray_pdone(             /* reap children and free data */
385                  free((void *)shm_boundary);
386                  shm_boundary = NULL;
387          }
388 +
389          ray_done(freall);               /* free rendering data */
390   }
391  
# Line 501 | Line 506 | ray_pclose(            /* close one or more child processes */
506                                          /* clear our ray queue */
507          while (ray_presult(&res,0) > 0)
508                  ;
509 +        r_send_next = 0;                /* hard reset in case of error */
510 +        r_recv_first = r_recv_next = RAYQLEN;
511                                          /* clean up children */
512          while (nsub--) {
513                  int     status;
# Line 518 | Line 525 | ray_pclose(            /* close one or more child processes */
525                  ray_pnidle--;
526          }
527          inclose--;
521 – }
522 –
523 –
524 – 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);
528   }

Diff Legend

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