ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/rxpmain.cpp
(Generate patch)

Comparing ray/src/rt/rxpmain.cpp (file contents):
Revision 2.1 by greg, Wed Aug 14 20:05:23 2024 UTC vs.
Revision 2.4 by greg, Wed Nov 6 18:28:52 2024 UTC

# Line 59 | Line 59 | static void printdefaults(void);
59  
60  
61   void
62 < quit(int code)                  /* quit program -- called from ray_done() */
62 > quit(int code)                  /* quit program */
63   {
64 <        if (ray_pnprocs < 0)
65 <                _exit(code);            /* avoid flush in child */
64 >        if (!code)
65 >                code = myRPmanager.Cleanup();
66  
67 –        int     ec = myRPmanager.Cleanup();
68 –
69 –        if (ec) code = ec;
70 –
67          exit(code);
68   }
69  
# Line 499 | Line 495 | progReporter(double pct)
495          static time_t   lastReportTime = 0;
496          time_t          tnow = time(NULL);
497  
498 <        if (tnow - lastReportTime < ralrm)
498 >        if (pct < 100.-FTINY && tnow - lastReportTime < ralrm)
499                  return;                 // too soon, my Precious...
500  
501          sprintf(errmsg, "%7.3f%% done after %7.3f hours\n", pct, (tnow-tstart)/3600.);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)