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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.21 by greg, Wed Jan 20 15:19:47 1993 UTC vs.
Revision 2.24 by greg, Tue May 25 10:30:08 1993 UTC

# Line 29 | Line 29 | static char SCCSid[] = "$SunId$ LBL";
29  
30   #define  RFTEMPLATE     "rfXXXXXX"
31  
32 + #ifndef SIGCONT
33 + #define SIGCONT         SIGIO
34 + #endif
35 +
36   int  dimlist[MAXDIM];                   /* sampling dimensions */
37   int  ndims = 0;                         /* number of sampling dimensions */
38   int  samplendx;                         /* sample index number */
# Line 78 | Line 82 | long  tlastrept = 0L;                  /* time at last report */
82   extern long  time();
83   extern long  tstart;                    /* starting time */
84  
85 < extern long  nrays;                     /* number of rays traced */
85 > extern unsigned long  nrays;            /* number of rays traced */
86  
87   #define  MAXDIV         16              /* maximum sample size */
88  
# Line 115 | Line 119 | report()               /* report progress */
119          t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6;
120          t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec;
121  
122 <        sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f CPU hours\n",
122 >        sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n",
123                          nrays, pctdone, t/3600.0);
124          eputs(errmsg);
125          tlastrept = time((long *)0);
# Line 124 | Line 128 | report()               /* report progress */
128   report()                /* report progress */
129   {
130          tlastrept = time((long *)0);
131 <        sprintf(errmsg, "%ld rays, %4.2f%% done after %5.4f hours\n",
131 >        sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n",
132                          nrays, pctdone, (tlastrept-tstart)/3600.0);
133          eputs(errmsg);
134 <        signal(SIGALRM, report);
134 >        signal(SIGCONT, report);
135   }
136   #endif
137  
# Line 324 | Line 328 | char  *zfile, *oldfile;
328   #ifndef  BSD
329          else
330   #endif
331 <        signal(SIGALRM, report);
331 >        signal(SIGCONT, report);
332          ypos = vres-1 - i;
333          fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep);
334                                                  /* compute scanlines */
# Line 347 | Line 351 | char  *zfile, *oldfile;
351                  fillscanbar(scanbar, zbar, hres, ypos, ystep);
352                                                          /* write it out */
353   #ifndef  BSD
354 <                signal(SIGALRM, SIG_IGN);       /* don't interrupt writes */
354 >                signal(SIGCONT, SIG_IGN);       /* don't interrupt writes */
355   #endif
356                  for (i = ystep; i > 0; i--) {
357                          if (zfd != -1 && write(zfd, (char *)zbar[i],
# Line 365 | Line 369 | char  *zfile, *oldfile;
369                          report();
370   #ifndef  BSD
371                  else
372 <                        signal(SIGALRM, report);
372 >                        signal(SIGCONT, report);
373   #endif
374          }
375                                                  /* clean up */
376 <        signal(SIGALRM, SIG_IGN);
376 >        signal(SIGCONT, SIG_IGN);
377          if (zfd != -1) {
378                  if (write(zfd, (char *)zbar[0], hres*sizeof(float))
379                                  < hres*sizeof(float))
# Line 389 | Line 393 | char  *zfile, *oldfile;
393          pctdone = 100.0;
394          if (ralrm > 0)
395                  report();
396 +        signal(SIGCONT, SIG_DFL);
397          return;
398   writerr:
399          error(SYSTEM, "write error in render");

Diff Legend

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