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.24 by greg, Sat Dec 12 23:08:13 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 223 | Line 224 | ray_pflush(void)                       /* send queued rays to idle childre
224                  ray_pnidle--;           /* now she's busy */
225          }
226          if (sfirst != r_send_next)
227 <                error(CONSISTENCY, "code screwup in ray_pflush");
227 >                error(CONSISTENCY, "code screwup in ray_pflush()");
228          r_send_next = 0;
229          return(sfirst);                 /* return total # sent */
230   }
# Line 238 | Line 239 | ray_psend(                     /* add a ray to our send queue */
239                  return;
240                                          /* flush output if necessary */
241          if (sendq_full() && ray_pflush() <= 0)
242 <                error(INTERNAL, "ray_pflush failed in ray_psend");
242 >                error(INTERNAL, "ray_pflush failed in ray_psend()");
243  
244          r_queue[r_send_next++] = *r;
245   }
# 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 325 | Line 329 | getready:                              /* any children waiting for us? */
329                                  poll ? &tpoll : (struct timeval *)NULL)) < 0)
330                          if (errno != EINTR) {
331                                  error(WARNING,
332 <                                        "select call failed in ray_presult");
332 >                                        "select call failed in ray_presult()");
333                                  ray_pclose(0);
334                                  return(-1);
335                          }
# 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 403 | Line 408 | ray_pchild(    /* process rays (never returns) */
408                                          /* get smuggled set length */
409                  n2 = sizeof(RAY)*r_queue[0].crtype - n;
410                  if (n2 < 0)
411 <                        error(INTERNAL, "buffer over-read in ray_pchild");
411 >                        error(INTERNAL, "buffer over-read in ray_pchild()");
412                  if (n2 > 0) {           /* read the rest of the set */
413                          i = readbuf(fd_in, (char *)r_queue + n, n2);
414                          if (i != n2)
# Line 425 | Line 430 | ray_pchild(    /* process rays (never returns) */
430                                          /* write back our results */
431                  i = writebuf(fd_out, (char *)r_queue, sizeof(RAY)*n);
432                  if (i != sizeof(RAY)*n)
433 <                        error(SYSTEM, "write error in ray_pchild");
433 >                        error(SYSTEM, "write error in ray_pchild()");
434          }
435          if (n)
436 <                error(SYSTEM, "read error in ray_pchild");
436 >                error(SYSTEM, "read error in ray_pchild()");
437          ambsync();
438          quit(0);                        /* normal exit */
439   }
# Line 463 | Line 468 | ray_popen(                     /* open the specified # processes */
468                                  close(r_proc[pn].fd_recv);
469                          }
470                          close(p0[0]); close(p1[1]);
471 +                        close(0);       /* don't share stdin */
472                                          /* following call never returns */
473                          ray_pchild(p1[0], p0[1]);
474                  }
# Line 501 | Line 507 | ray_pclose(            /* close one or more child processes */
507                                          /* clear our ray queue */
508          while (ray_presult(&res,0) > 0)
509                  ;
510 +        r_send_next = 0;                /* hard reset in case of error */
511 +        r_recv_first = r_recv_next = RAYQLEN;
512                                          /* clean up children */
513          while (nsub--) {
514                  int     status;
515                  ray_pnprocs--;
508 –                close(r_proc[ray_pnprocs].fd_recv);
516                  close(r_proc[ray_pnprocs].fd_send);
517                  if (waitpid(r_proc[ray_pnprocs].pid, &status, 0) < 0)
518                          status = 127<<8;
519 +                close(r_proc[ray_pnprocs].fd_recv);
520                  if (status) {
521                          sprintf(errmsg,
522                                  "rendering process %d exited with code %d",
# Line 518 | Line 526 | ray_pclose(            /* close one or more child processes */
526                  ray_pnidle--;
527          }
528          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);
529   }

Diff Legend

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