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

Comparing ray/src/rt/rxcmain.cpp (file contents):
Revision 2.11 by greg, Mon Dec 23 16:15:38 2024 UTC vs.
Revision 2.14 by greg, Thu Jan 2 16:16:49 2025 UTC

# Line 47 | Line 47 | printdefaults(void)                    /* print default values to stdou
47          if (myRCmanager.HasFlag(RTimmIrrad))
48                  printf("-I+\t\t\t\t# immediate irradiance on\n");
49          printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
50 <        if (myRCmanager.xres > 0)
51 <                printf("-x %-9d\t\t\t# x resolution\n", myRCmanager.xres);
50 >        printf("-x %-9d\t\t\t# x resolution\n", myRCmanager.xres);
51          printf("-y %-9d\t\t\t# y resolution\n", myRCmanager.yres);
52          printf(myRCmanager.HasFlag(RTlimDist) ?
53                          "-ld+\t\t\t\t# limit distance on\n" :
# Line 56 | Line 55 | printdefaults(void)                    /* print default values to stdou
55          printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
56                          inpfmt, outfmt, formstr(inpfmt), formstr(outfmt));
57          if (report_intvl > 0)
58 <                printf("-t %-9d\t\t\t#  time between reports\n", report_intvl);
58 >                printf("-t %-9d\t\t\t# time between reports\n", report_intvl);
59          printf(erract[WARNING].pf != NULL ?
60                          "-w+\t\t\t\t# warning messages on\n" :
61                          "-w-\t\t\t\t# warning messages off\n");
# Line 75 | Line 74 | onsig(                         /* fatal signal */
74                  _exit(signo);
75  
76   #ifdef SIGALRM
77 <        alarm(180);                     /* allow 3 minutes to clean up */
77 >        alarm(600);                     /* allow 10 minutes to clean up */
78          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
79   #endif
80          eputs("signal - ");
# Line 358 | Line 357 | main(int argc, char *argv[])
357          if (rval >= myRCmanager.GetRowMax()) {
358                  error(WARNING, "nothing left to compute");
359                  quit(0);
360 <        }                               // add processes as requested
362 <        myRCmanager.SetThreadCount(nproc);
363 <
360 >        }
361          rxcontrib(rval);                /* trace ray contributions (loop) */
362  
363          quit(0);        /* exit clean */
# Line 499 | Line 496 | rxcontrib(const int rstart)
496                  }
497                  last_report = tstart = time(0);
498          }
499 +                                        // start children as requested
500 +        myRCmanager.SetThreadCount(nproc);
501 +
502          while (r < totRows) {           // loop until done
503                  time_t  tnow;
504                  if (!getRayBundle(odarr))
# Line 508 | Line 508 | rxcontrib(const int rstart)
508                  r++;
509                  if (report_intvl <= 0)
510                          continue;
511 <                tnow = time(0);         // time to report progress?
512 <                if (r == totRows)
513 <                        myRCmanager.FlushQueue();
514 <                else if (tnow < last_report+report_intvl)
511 >                if (r == totRows)       // need to finish up?
512 >                        myRCmanager.SetThreadCount(1);
513 >                tnow = time(0);
514 >                if ((r < totRows) & (tnow < last_report+report_intvl))
515                          continue;
516                  sprintf(errmsg, "%.2f%% done after %.3f hours\n",
517                                  100.*myRCmanager.GetRowFinished()/totRows,

Diff Legend

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