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 |
|
#endif |
24 |
+ |
#endif |
25 |
|
|
26 |
|
#include <signal.h> |
27 |
|
|
127 |
|
} |
128 |
|
|
129 |
|
|
130 |
< |
#ifdef BSD |
130 |
> |
#ifndef NIX |
131 |
|
report() /* report progress */ |
132 |
|
{ |
133 |
+ |
char hostname[128]; |
134 |
+ |
double u, s; |
135 |
+ |
#ifdef BSD |
136 |
|
struct rusage rubuf; |
137 |
< |
double t; |
137 |
> |
#else |
138 |
> |
struct tms tbuf; |
139 |
> |
#endif |
140 |
|
|
141 |
+ |
tlastrept = time((long *)0); |
142 |
+ |
#ifdef BSD |
143 |
|
getrusage(RUSAGE_SELF, &rubuf); |
144 |
< |
t = (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
145 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
144 |
> |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
145 |
> |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
146 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
147 |
< |
t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
148 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
147 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
148 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
149 |
> |
#else |
150 |
> |
times(&tbuf); |
151 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; |
152 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; |
153 |
> |
#endif |
154 |
> |
gethostname(hostname, sizeof(hostname)); |
155 |
|
|
156 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n", |
157 |
< |
nrays, pctdone, t/3600.0); |
156 |
> |
sprintf(errmsg, |
157 |
> |
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
158 |
> |
nrays, pctdone, u/3600., s/3600., |
159 |
> |
(tlastrept-tstart)/3600., hostname); |
160 |
|
eputs(errmsg); |
140 |
– |
tlastrept = time((long *)0); |
161 |
|
} |
162 |
|
#else |
163 |
|
report() /* report progress */ |
164 |
|
{ |
165 |
|
tlastrept = time((long *)0); |
166 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n", |
166 |
> |
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
167 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
168 |
|
eputs(errmsg); |
169 |
|
signal(SIGCONT, report); |
627 |
|
getheader(fp, NULL, NULL); |
628 |
|
/* get picture size */ |
629 |
|
if (!fscnresolu(&x, &y, fp)) { |
630 |
< |
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
630 |
> |
sprintf(errmsg, "bad recover file \"%s\" - not removed", |
631 |
> |
oldfile); |
632 |
|
error(WARNING, errmsg); |
633 |
|
fclose(fp); |
634 |
|
return(0); |