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.27 by greg, Sat Aug 20 06:05:53 2011 UTC

# Line 73 | Line 73 | static const char      RCSid[] = "$Id$";
73   *  results aren't ready, but will immediately return 0.
74   *  If the second argument is 0, the call will block
75   *  until a value is available, returning 0 only if the
76 < *  queue is completely empty.  A negative return value
76 > *  queue is completely empty.  Setting the second argument
77 > *  to -1 returns 0 unless a ray is ready in the queue and
78 > *  no system calls are needed.  A negative return value
79   *  indicates that a rendering process died.  If this
80   *  happens, ray_pclose(0) is automatically called to close
81   *  all child processes, and ray_pnprocs is set to zero.
# Line 86 | Line 88 | static const char      RCSid[] = "$Id$";
88   *              ray_psend(&myRay);
89   *      }
90   *
91 < *  Note that it is a fatal error to call ra_psend() when
92 < *  ray_pnidle is zero.  The ray_presult() and/or ray_pqueue()
93 < *  functions may be called subsequently to read back the results.
91 > *  Note that it is a mistake to call ra_psend() when
92 > *  ray_pnidle is zero, and nothing will be sent in
93 > *  this case.  Otherwise, the ray_presult() and/or ray_pqueue()
94 > *  functions may be called subsequently to read back the results
95 > *  of rays queued by ray_psend().
96   *
97   *  When you are done, you may call ray_pdone(1) to close
98   *  all child processes and clean up memory used by Radiance.
# Line 97 | Line 101 | static const char      RCSid[] = "$Id$";
101   *  and fonts that are likely to be used in subsequent renderings.
102   *  Whether you need to clean up memory or not, you should
103   *  at least call ray_pclose(0) to await the child processes.
104 + *  The caller should define a quit() function that calls
105 + *  ray_pclose(0) if ray_pnprocs > 0.
106   *
107   *  Warning:  You cannot affect any of the rendering processes
108   *  by changing global parameter values onece ray_pinit() has
# Line 166 | Line 172 | static struct child_proc {
172   } r_proc[MAX_NPROCS];                   /* our child processes */
173  
174   static RAY      r_queue[2*RAYQLEN];     /* ray i/o buffer */
175 < static int      r_send_next;            /* next send ray placement */
176 < static int      r_recv_first;           /* position of first unreported ray */
177 < static int      r_recv_next;            /* next received ray placement */
175 > static int      r_send_next = 0;        /* next send ray placement */
176 > static int      r_recv_first = RAYQLEN; /* position of first unreported ray */
177 > static int      r_recv_next = RAYQLEN;  /* next received ray placement */
178  
179   #define sendq_full()    (r_send_next >= RAYQLEN)
180  
# Line 187 | Line 193 | ray_pinit(             /* initialize ray-tracing processes */
193  
194          ray_init(otnm);                 /* load the shared scene */
195  
190 –        r_send_next = 0;                /* set up queue */
191 –        r_recv_first = r_recv_next = RAYQLEN;
192 –
196          ray_popen(nproc);               /* fork children */
197   }
198  
# Line 223 | Line 226 | ray_pflush(void)                       /* send queued rays to idle childre
226                  ray_pnidle--;           /* now she's busy */
227          }
228          if (sfirst != r_send_next)
229 <                error(CONSISTENCY, "code screwup in ray_pflush");
229 >                error(CONSISTENCY, "code screwup in ray_pflush()");
230          r_send_next = 0;
231          return(sfirst);                 /* return total # sent */
232   }
233  
234  
235 < void
235 > int
236   ray_psend(                      /* add a ray to our send queue */
237          RAY     *r
238   )
239   {
240 <        if (r == NULL)
241 <                return;
240 >        int     rv;
241 >
242 >        if ((r == NULL) | (ray_pnidle <= 0))
243 >                return(0);
244                                          /* flush output if necessary */
245 <        if (sendq_full() && ray_pflush() <= 0)
246 <                error(INTERNAL, "ray_pflush failed in ray_psend");
245 >        if (sendq_full() && (rv = ray_pflush()) <= 0)
246 >                return(rv);
247  
248          r_queue[r_send_next++] = *r;
249 +        return(1);
250   }
251  
252  
# Line 259 | Line 265 | ray_pqueue(                    /* queue a ray for computation */
265                          return(-1);
266                                          /* put new ray in queue */
267                  r_queue[r_send_next++] = mySend;
268 <                                /* XXX r_send_next may now be > RAYQLEN */
268 >
269                  return(1);
270          }
271                                          /* else add ray to send queue */
# Line 291 | Line 297 | ray_presult(           /* check for a completed ray */
297                  *r = r_queue[r_recv_first++];
298                  return(1);
299          }
300 +        if (poll < 0)                   /* immediate polling mode? */
301 +                return(0);
302 +
303          n = ray_pnprocs - ray_pnidle;   /* pending before flush? */
304  
305          if (ray_pflush() < 0)           /* send new rays to process */
# Line 325 | Line 334 | getready:                              /* any children waiting for us? */
334                                  poll ? &tpoll : (struct timeval *)NULL)) < 0)
335                          if (errno != EINTR) {
336                                  error(WARNING,
337 <                                        "select call failed in ray_presult");
337 >                                        "select call failed in ray_presult()");
338                                  ray_pclose(0);
339                                  return(-1);
340                          }
# Line 381 | Line 390 | ray_pdone(             /* reap children and free data */
390                  free((void *)shm_boundary);
391                  shm_boundary = NULL;
392          }
393 +
394          ray_done(freall);               /* free rendering data */
395   }
396  
# Line 403 | Line 413 | ray_pchild(    /* process rays (never returns) */
413                                          /* get smuggled set length */
414                  n2 = sizeof(RAY)*r_queue[0].crtype - n;
415                  if (n2 < 0)
416 <                        error(INTERNAL, "buffer over-read in ray_pchild");
416 >                        error(INTERNAL, "buffer over-read in ray_pchild()");
417                  if (n2 > 0) {           /* read the rest of the set */
418                          i = readbuf(fd_in, (char *)r_queue + n, n2);
419                          if (i != n2)
# Line 425 | Line 435 | ray_pchild(    /* process rays (never returns) */
435                                          /* write back our results */
436                  i = writebuf(fd_out, (char *)r_queue, sizeof(RAY)*n);
437                  if (i != sizeof(RAY)*n)
438 <                        error(SYSTEM, "write error in ray_pchild");
438 >                        error(SYSTEM, "write error in ray_pchild()");
439          }
440          if (n)
441 <                error(SYSTEM, "read error in ray_pchild");
441 >                error(SYSTEM, "read error in ray_pchild()");
442          ambsync();
443          quit(0);                        /* normal exit */
444   }
# Line 463 | Line 473 | ray_popen(                     /* open the specified # processes */
473                                  close(r_proc[pn].fd_recv);
474                          }
475                          close(p0[0]); close(p1[1]);
476 +                        close(0);       /* don't share stdin */
477                                          /* following call never returns */
478                          ray_pchild(p1[0], p0[1]);
479                  }
480                  if (r_proc[ray_pnprocs].pid < 0)
481                          error(SYSTEM, "cannot fork child process");
482                  close(p1[0]); close(p0[1]);
483 +                if (rand_samp)          /* desynchronize random function */
484 +                        srandom((long)r_proc[ray_pnprocs].pid);
485                  /*
486                   * Close write stream on exec to avoid multiprocessing deadlock.
487                   * No use in read stream without it, so set flag there as well.
# Line 495 | Line 508 | ray_pclose(            /* close one or more child processes */
508          if (inclose)
509                  return;
510          inclose++;
511 +                                        /* check no child / in child */
512 +        if (ray_pnprocs <= 0)
513 +                return;
514                                          /* check argument */
515          if ((nsub <= 0) | (nsub > ray_pnprocs))
516                  nsub = ray_pnprocs;
517                                          /* clear our ray queue */
518          while (ray_presult(&res,0) > 0)
519                  ;
520 +        r_send_next = 0;                /* hard reset in case of error */
521 +        r_recv_first = r_recv_next = RAYQLEN;
522                                          /* clean up children */
523          while (nsub--) {
524                  int     status;
525                  ray_pnprocs--;
508 –                close(r_proc[ray_pnprocs].fd_recv);
526                  close(r_proc[ray_pnprocs].fd_send);
527                  if (waitpid(r_proc[ray_pnprocs].pid, &status, 0) < 0)
528                          status = 127<<8;
529 +                close(r_proc[ray_pnprocs].fd_recv);
530                  if (status) {
531                          sprintf(errmsg,
532                                  "rendering process %d exited with code %d",
# Line 518 | Line 536 | ray_pclose(            /* close one or more child processes */
536                  ray_pnidle--;
537          }
538          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);
539   }

Diff Legend

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