ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rcontrib.c
(Generate patch)

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.31 by greg, Fri Feb 23 03:21:24 2018 UTC vs.
Revision 2.37 by greg, Wed Sep 9 21:28:19 2020 UTC

# Line 21 | Line 21 | int    dimlist[MAXDIM];                /* sampling dimensions */
21   int     ndims = 0;                      /* number of sampling dimensions */
22   int     samplendx = 0;                  /* index for this sample */
23  
24 < static void     trace_contrib(RAY *r);  /* our trace callback */
25 < void    (*trace)() = trace_contrib;
24 > void    (*trace)() = NULL;              /* trace call (NULL before rcinit) */
25  
26   int     do_irrad = 0;                   /* compute irradiance? */
27  
# Line 67 | Line 66 | long   waitflush;                      /* how long until next flush */
66   RNUMBER lastray = 0;                    /* last ray number sent */
67   RNUMBER lastdone = 0;                   /* last ray output */
68  
69 + static void     trace_contrib(RAY *r);  /* our trace callback */
70 +
71   static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); }
72  
73   LUTAB   modconttab = LU_SINIT(NULL,mcfree);     /* modifier lookup table */
# Line 171 | Line 172 | addmodfile(char *fname, char *outf, char *prms, char *
172   }
173  
174  
175 + /* Check if we have any more rays left (and report progress) */
176 + int
177 + morays(void)
178 + {
179 +        static RNUMBER  total_rays;
180 +        static time_t   tstart, last_report;
181 +        time_t          tnow;
182 +
183 +        if (!raysleft)
184 +                return(1);      /* unknown total, so nothing to do or say */
185 +
186 +        if (report_intvl > 0 && (tnow = time(0)) >= last_report+report_intvl) {
187 +                if (!total_rays) {
188 +                        total_rays = raysleft;
189 +                        tstart = tnow;
190 +                }
191 +                sprintf(errmsg, "%.2f%% done after %.3f hours",
192 +                                100.-100.*raysleft/total_rays,
193 +                                (1./3600.)*(tnow - tstart));
194 +                eputs(errmsg);
195 +                last_report = tnow;
196 +        }
197 +        return(--raysleft);
198 + }
199 +
200 +
201 + /* Quit program */
202   void
203 < quit(                   /* quit program */
203 > quit(
204          int  code
205   )
206   {
207          if (nchild > 0)         /* close children if any */
208                  end_children(code != 0);
209 +        else if (nchild < 0)
210 +                _exit(code);    /* avoid flush() in child */
211          exit(code);
212   }
213  
# Line 196 | Line 226 | rcinit(void)
226                                          /* set shared memory boundary */
227                  shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
228          }
229 +        trace = trace_contrib;          /* set up trace call-back */
230          for (i = 0; i < nsources; i++)  /* tracing to sources as well */
231                  source[i].sflags |= SFOLLOW;
232          if (yres > 0) {                 /* set up flushing & ray counts */
# Line 279 | Line 310 | eval_irrad(FVECT org, FVECT dir)
310          thisray.rmax = 0.0;
311          rayorigin(&thisray, PRIMARY, NULL, NULL);
312                                          /* pretend we hit surface */
313 <        thisray.rt = thisray.rot = 1e-5;
313 >        thisray.rxt = thisray.rot = 1e-5;
314          thisray.rod = 1.0;
315          VCOPY(thisray.ron, dir);
316          VSUM(thisray.rop, org, dir, 1e-4);
# Line 360 | Line 391 | rcontrib(void)
391                  }
392                  done_contrib();         /* accumulate/output */
393                  ++lastdone;
394 <                if (raysleft && !--raysleft)
394 >                if (!morays())
395                          break;          /* preemptive EOI */
396          }
397          if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines