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.19 by greg, Wed Feb 20 05:21:29 2008 UTC vs.
Revision 2.20 by greg, Tue Dec 2 23:28:34 2008 UTC

# Line 185 | Line 185 | ray_pinit(             /* initialize ray-tracing processes */
185  
186          ray_init(otnm);                 /* load the shared scene */
187  
188 –        preload_objs();                 /* preload auxiliary data */
189 –
190 –                                        /* set shared memory boundary */
191 –        shm_boundary = (char *)malloc(16);
192 –        strcpy(shm_boundary, "SHM_BOUNDARY");
193 –
188          r_send_next = 0;                /* set up queue */
189          r_recv_first = r_recv_next = RAYQLEN;
190  
# Line 448 | Line 442 | ray_popen(                     /* open the specified # processes */
442          if (nadd <= 0)
443                  return;
444          ambsync();                      /* load any new ambient values */
445 +        if (shm_boundary == NULL) {     /* first child process? */
446 +                preload_objs();         /* preload auxiliary data */
447 +                                        /* set shared memory boundary */
448 +                shm_boundary = (char *)malloc(16);
449 +                strcpy(shm_boundary, "SHM_BOUNDARY");
450 +        }
451          fflush(NULL);                   /* clear pending output */
452          while (nadd--) {                /* fork each new process */
453                  int     p0[2], p1[2];

Diff Legend

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