1 |
< |
/* Copyright (c) 1992 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1993 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
12 |
|
|
13 |
|
#include "ray.h" |
14 |
|
|
15 |
+ |
#include <sys/types.h> |
16 |
+ |
|
17 |
+ |
#ifndef NIX |
18 |
|
#ifdef BSD |
19 |
|
#include <sys/time.h> |
20 |
|
#include <sys/resource.h> |
21 |
+ |
#else |
22 |
+ |
#include <sys/times.h> |
23 |
+ |
#include <sys/utsname.h> |
24 |
+ |
#include <unistd.h> |
25 |
|
#endif |
26 |
+ |
#endif |
27 |
|
|
28 |
+ |
extern time_t time(); |
29 |
+ |
|
30 |
|
#include <signal.h> |
31 |
|
|
32 |
|
#include "view.h" |
87 |
|
|
88 |
|
double pctdone = 0.0; /* percentage done */ |
89 |
|
|
90 |
< |
long tlastrept = 0L; /* time at last report */ |
90 |
> |
time_t tlastrept = 0L; /* time at last report */ |
91 |
|
|
92 |
< |
extern long time(); |
83 |
< |
extern long tstart; /* starting time */ |
92 |
> |
extern time_t tstart; /* starting time */ |
93 |
|
|
94 |
|
extern unsigned long nrays; /* number of rays traced */ |
95 |
|
|
130 |
|
} |
131 |
|
|
132 |
|
|
133 |
< |
#ifdef BSD |
133 |
> |
#ifndef NIX |
134 |
|
report() /* report progress */ |
135 |
|
{ |
136 |
+ |
double u, s; |
137 |
+ |
#ifdef BSD |
138 |
+ |
char hostname[257]; |
139 |
|
struct rusage rubuf; |
140 |
< |
double t; |
140 |
> |
#else |
141 |
> |
struct tms tbuf; |
142 |
> |
struct utsname nambuf; |
143 |
> |
double period; |
144 |
> |
#define hostname nambuf.nodename |
145 |
> |
#endif |
146 |
|
|
147 |
+ |
tlastrept = time((time_t *)NULL); |
148 |
+ |
#ifdef BSD |
149 |
|
getrusage(RUSAGE_SELF, &rubuf); |
150 |
< |
t = (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
151 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
150 |
> |
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
151 |
> |
s = rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
152 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
153 |
< |
t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
154 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
153 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
154 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
155 |
> |
gethostname(hostname, sizeof(hostname)); |
156 |
> |
#else |
157 |
> |
times(&tbuf); |
158 |
> |
#ifdef _SC_CLK_TCK |
159 |
> |
period = 1.0 / sysconf(_SC_CLK_TCK); |
160 |
> |
#else |
161 |
> |
period = 1.0 / 60.0; |
162 |
> |
#endif |
163 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; |
164 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; |
165 |
> |
uname(&nambuf); |
166 |
> |
#endif |
167 |
|
|
168 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n", |
169 |
< |
nrays, pctdone, t/3600.0); |
168 |
> |
sprintf(errmsg, |
169 |
> |
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
170 |
> |
nrays, pctdone, u/3600., s/3600., |
171 |
> |
(tlastrept-tstart)/3600., hostname); |
172 |
|
eputs(errmsg); |
173 |
< |
tlastrept = time((long *)0); |
173 |
> |
#ifndef BSD |
174 |
> |
signal(SIGCONT, report); |
175 |
> |
#undef hostname |
176 |
> |
#endif |
177 |
|
} |
178 |
|
#else |
179 |
|
report() /* report progress */ |
180 |
|
{ |
181 |
< |
tlastrept = time((long *)0); |
182 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n", |
181 |
> |
tlastrept = time((time_t *)NULL); |
182 |
> |
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
183 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
184 |
|
eputs(errmsg); |
149 |
– |
signal(SIGCONT, report); |
185 |
|
} |
186 |
|
#endif |
187 |
|
|
437 |
|
goto writerr; |
438 |
|
/* record progress */ |
439 |
|
pctdone = 100.0*(vres-1-ypos)/vres; |
440 |
< |
if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm) |
440 |
> |
if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) |
441 |
|
report(); |
442 |
|
#ifndef BSD |
443 |
|
else |
642 |
|
getheader(fp, NULL, NULL); |
643 |
|
/* get picture size */ |
644 |
|
if (!fscnresolu(&x, &y, fp)) { |
645 |
< |
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
645 |
> |
sprintf(errmsg, "bad recover file \"%s\" - not removed", |
646 |
> |
oldfile); |
647 |
|
error(WARNING, errmsg); |
648 |
|
fclose(fp); |
649 |
|
return(0); |