| 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 |
| 20 |
– |
#include <sys/types.h> |
| 22 |
|
#include <sys/times.h> |
| 23 |
< |
#include <limits.h> |
| 24 |
< |
extern time_t time(); |
| 23 |
> |
#include <sys/utsname.h> |
| 24 |
> |
#include <unistd.h> |
| 25 |
|
#endif |
| 25 |
– |
#else |
| 26 |
– |
extern unsigned long time(); |
| 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 |
< |
unsigned long tlastrept = 0L; /* time at last report */ |
| 90 |
> |
time_t tlastrept = 0L; /* time at last report */ |
| 91 |
|
|
| 92 |
< |
extern unsigned long tstart; /* starting time */ |
| 92 |
> |
extern time_t tstart; /* starting time */ |
| 93 |
|
|
| 94 |
|
extern unsigned long nrays; /* number of rays traced */ |
| 95 |
|
|
| 133 |
|
#ifndef NIX |
| 134 |
|
report() /* report progress */ |
| 135 |
|
{ |
| 135 |
– |
char hostname[128]; |
| 136 |
|
double u, s; |
| 137 |
|
#ifdef BSD |
| 138 |
+ |
char hostname[257]; |
| 139 |
|
struct rusage rubuf; |
| 140 |
|
#else |
| 141 |
|
struct tms tbuf; |
| 142 |
+ |
struct utsname nambuf; |
| 143 |
+ |
double period; |
| 144 |
+ |
#define hostname nambuf.nodename |
| 145 |
|
#endif |
| 146 |
|
|
| 147 |
< |
tlastrept = time((unsigned long *)NULL); |
| 147 |
> |
tlastrept = time((time_t *)NULL); |
| 148 |
|
#ifdef BSD |
| 149 |
|
getrusage(RUSAGE_SELF, &rubuf); |
| 150 |
|
u = rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
| 152 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
| 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 |
< |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; |
| 159 |
< |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; |
| 158 |
> |
period = 1.0 / sysconf(_SC_CLK_TCK); |
| 159 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; |
| 160 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; |
| 161 |
> |
uname(&nambuf); |
| 162 |
|
#endif |
| 156 |
– |
gethostname(hostname, sizeof(hostname)); |
| 163 |
|
|
| 164 |
|
sprintf(errmsg, |
| 165 |
|
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
| 166 |
|
nrays, pctdone, u/3600., s/3600., |
| 167 |
|
(tlastrept-tstart)/3600., hostname); |
| 168 |
|
eputs(errmsg); |
| 169 |
+ |
#ifndef BSD |
| 170 |
+ |
signal(SIGCONT, report); |
| 171 |
+ |
#undef hostname |
| 172 |
+ |
#endif |
| 173 |
|
} |
| 174 |
|
#else |
| 175 |
|
report() /* report progress */ |
| 176 |
|
{ |
| 177 |
< |
tlastrept = time((unsigned long *)NULL); |
| 177 |
> |
tlastrept = time((time_t *)NULL); |
| 178 |
|
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
| 179 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
| 180 |
|
eputs(errmsg); |
| 171 |
– |
signal(SIGCONT, report); |
| 181 |
|
} |
| 182 |
|
#endif |
| 183 |
|
|
| 433 |
|
goto writerr; |
| 434 |
|
/* record progress */ |
| 435 |
|
pctdone = 100.0*(vres-1-ypos)/vres; |
| 436 |
< |
if (ralrm > 0 && time((unsigned long *)NULL) >= tlastrept+ralrm) |
| 436 |
> |
if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) |
| 437 |
|
report(); |
| 438 |
|
#ifndef BSD |
| 439 |
|
else |
