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 */ |
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 |
|
|
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); |
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 |
|
|
201 |
|
do { |
202 |
|
if (seq && nextview(stdin) == EOF) |
203 |
|
break; |
204 |
+ |
pctdone = 0.0; |
205 |
|
if (pout != NULL) { |
206 |
|
sprintf(fbuf, pout, seq); |
207 |
|
if (freopen(fbuf, "w", stdout) == NULL) { |
329 |
|
#ifndef BSD |
330 |
|
else |
331 |
|
#endif |
332 |
< |
signal(SIGALRM, report); |
332 |
> |
signal(SIGCONT, report); |
333 |
|
ypos = vres-1 - i; |
334 |
|
fillscanline(scanbar[0], zbar[0], sampdens, hres, ypos, hstep); |
335 |
|
/* compute scanlines */ |
352 |
|
fillscanbar(scanbar, zbar, hres, ypos, ystep); |
353 |
|
/* write it out */ |
354 |
|
#ifndef BSD |
355 |
< |
signal(SIGALRM, SIG_IGN); /* don't interrupt writes */ |
355 |
> |
signal(SIGCONT, SIG_IGN); /* don't interrupt writes */ |
356 |
|
#endif |
357 |
|
for (i = ystep; i > 0; i--) { |
358 |
|
if (zfd != -1 && write(zfd, (char *)zbar[i], |
370 |
|
report(); |
371 |
|
#ifndef BSD |
372 |
|
else |
373 |
< |
signal(SIGALRM, report); |
373 |
> |
signal(SIGCONT, report); |
374 |
|
#endif |
375 |
|
} |
376 |
|
/* clean up */ |
377 |
< |
signal(SIGALRM, SIG_IGN); |
377 |
> |
signal(SIGCONT, SIG_IGN); |
378 |
|
if (zfd != -1) { |
379 |
|
if (write(zfd, (char *)zbar[0], hres*sizeof(float)) |
380 |
|
< hres*sizeof(float)) |
394 |
|
pctdone = 100.0; |
395 |
|
if (ralrm > 0) |
396 |
|
report(); |
397 |
+ |
signal(SIGCONT, SIG_DFL); |
398 |
|
return; |
399 |
|
writerr: |
400 |
|
error(SYSTEM, "write error in render"); |