12 |
|
|
13 |
|
#include "ray.h" |
14 |
|
|
15 |
+ |
#ifndef NIX |
16 |
|
#ifdef BSD |
17 |
|
#include <sys/time.h> |
18 |
|
#include <sys/resource.h> |
19 |
+ |
#else |
20 |
+ |
#include <sys/types.h> |
21 |
+ |
#include <sys/times.h> |
22 |
+ |
#include <limits.h> |
23 |
+ |
extern time_t time(); |
24 |
|
#endif |
25 |
+ |
#else |
26 |
+ |
extern unsigned long time(); |
27 |
+ |
#endif |
28 |
|
|
29 |
|
#include <signal.h> |
30 |
|
|
86 |
|
|
87 |
|
double pctdone = 0.0; /* percentage done */ |
88 |
|
|
89 |
< |
long tlastrept = 0L; /* time at last report */ |
89 |
> |
unsigned long tlastrept = 0L; /* time at last report */ |
90 |
|
|
91 |
< |
extern long time(); |
83 |
< |
extern long tstart; /* starting time */ |
91 |
> |
extern unsigned long tstart; /* starting time */ |
92 |
|
|
93 |
|
extern unsigned long nrays; /* number of rays traced */ |
94 |
|
|
129 |
|
} |
130 |
|
|
131 |
|
|
132 |
< |
#ifdef BSD |
132 |
> |
#ifndef NIX |
133 |
|
report() /* report progress */ |
134 |
|
{ |
135 |
+ |
char hostname[128]; |
136 |
+ |
double u, s; |
137 |
+ |
#ifdef BSD |
138 |
|
struct rusage rubuf; |
139 |
< |
double t; |
139 |
> |
#else |
140 |
> |
struct tms tbuf; |
141 |
> |
#endif |
142 |
|
|
143 |
+ |
tlastrept = time((unsigned long *)NULL); |
144 |
+ |
#ifdef BSD |
145 |
|
getrusage(RUSAGE_SELF, &rubuf); |
146 |
< |
t = (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
147 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
146 |
> |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
147 |
> |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
148 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
149 |
< |
t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
150 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
149 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
150 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
151 |
> |
#else |
152 |
> |
times(&tbuf); |
153 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; |
154 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; |
155 |
> |
#endif |
156 |
> |
gethostname(hostname, sizeof(hostname)); |
157 |
|
|
158 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n", |
159 |
< |
nrays, pctdone, t/3600.0); |
158 |
> |
sprintf(errmsg, |
159 |
> |
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
160 |
> |
nrays, pctdone, u/3600., s/3600., |
161 |
> |
(tlastrept-tstart)/3600., hostname); |
162 |
|
eputs(errmsg); |
140 |
– |
tlastrept = time((long *)0); |
163 |
|
} |
164 |
|
#else |
165 |
|
report() /* report progress */ |
166 |
|
{ |
167 |
< |
tlastrept = time((long *)0); |
168 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n", |
167 |
> |
tlastrept = time((unsigned long *)NULL); |
168 |
> |
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
169 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
170 |
|
eputs(errmsg); |
171 |
|
signal(SIGCONT, report); |
424 |
|
goto writerr; |
425 |
|
/* record progress */ |
426 |
|
pctdone = 100.0*(vres-1-ypos)/vres; |
427 |
< |
if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm) |
427 |
> |
if (ralrm > 0 && time((unsigned long *)NULL) >= tlastrept+ralrm) |
428 |
|
report(); |
429 |
|
#ifndef BSD |
430 |
|
else |
629 |
|
getheader(fp, NULL, NULL); |
630 |
|
/* get picture size */ |
631 |
|
if (!fscnresolu(&x, &y, fp)) { |
632 |
< |
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
632 |
> |
sprintf(errmsg, "bad recover file \"%s\" - not removed", |
633 |
> |
oldfile); |
634 |
|
error(WARNING, errmsg); |
635 |
|
fclose(fp); |
636 |
|
return(0); |