| 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 <limits.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 |
> |
#define hostname nambuf.sysname |
| 144 |
> |
#endif |
| 145 |
|
|
| 146 |
+ |
tlastrept = time((time_t *)NULL); |
| 147 |
+ |
#ifdef BSD |
| 148 |
|
getrusage(RUSAGE_SELF, &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 |
|
getrusage(RUSAGE_CHILDREN, &rubuf); |
| 152 |
< |
t += (rubuf.ru_utime.tv_usec + rubuf.ru_stime.tv_usec) / 1e6; |
| 153 |
< |
t += rubuf.ru_utime.tv_sec + rubuf.ru_stime.tv_sec; |
| 152 |
> |
u += rubuf.ru_utime.tv_sec + rubuf.ru_utime.tv_usec/1e6; |
| 153 |
> |
s += rubuf.ru_stime.tv_sec + rubuf.ru_stime.tv_usec/1e6; |
| 154 |
> |
gethostname(hostname, sizeof(hostname)); |
| 155 |
> |
#else |
| 156 |
> |
times(&tbuf); |
| 157 |
> |
u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; |
| 158 |
> |
s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; |
| 159 |
> |
uname(&nambuf); |
| 160 |
> |
#endif |
| 161 |
|
|
| 162 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f CPU hours\n", |
| 163 |
< |
nrays, pctdone, t/3600.0); |
| 162 |
> |
sprintf(errmsg, |
| 163 |
> |
"%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s\n", |
| 164 |
> |
nrays, pctdone, u/3600., s/3600., |
| 165 |
> |
(tlastrept-tstart)/3600., hostname); |
| 166 |
|
eputs(errmsg); |
| 167 |
< |
tlastrept = time((long *)0); |
| 167 |
> |
#undef hostname |
| 168 |
|
} |
| 169 |
|
#else |
| 170 |
|
report() /* report progress */ |
| 171 |
|
{ |
| 172 |
< |
tlastrept = time((long *)0); |
| 173 |
< |
sprintf(errmsg, "%lu rays, %4.2f%% done after %5.4f hours\n", |
| 172 |
> |
tlastrept = time((time_t *)NULL); |
| 173 |
> |
sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", |
| 174 |
|
nrays, pctdone, (tlastrept-tstart)/3600.0); |
| 175 |
|
eputs(errmsg); |
| 176 |
|
signal(SIGCONT, report); |
| 232 |
|
cp--; |
| 233 |
|
strcpy(cp, RFTEMPLATE); |
| 234 |
|
prvr = mktemp(fbuf2); |
| 235 |
< |
if (rename(fbuf, prvr) < 0 && errno != ENOENT) { |
| 236 |
< |
sprintf(errmsg, |
| 235 |
> |
if (rename(fbuf, prvr) < 0) |
| 236 |
> |
if (errno == ENOENT) { /* ghost file */ |
| 237 |
> |
sprintf(errmsg, |
| 238 |
> |
"new output file \"%s\"", |
| 239 |
> |
fbuf); |
| 240 |
> |
error(WARNING, errmsg); |
| 241 |
> |
prvr = NULL; |
| 242 |
> |
} else { /* serious error */ |
| 243 |
> |
sprintf(errmsg, |
| 244 |
|
"cannot rename \"%s\" to \"%s\"", |
| 245 |
|
fbuf, prvr); |
| 246 |
< |
error(SYSTEM, errmsg); |
| 247 |
< |
} |
| 246 |
> |
error(SYSTEM, errmsg); |
| 247 |
> |
} |
| 248 |
|
} |
| 249 |
|
} |
| 250 |
|
npicts = 0; /* render sequence */ |
| 429 |
|
goto writerr; |
| 430 |
|
/* record progress */ |
| 431 |
|
pctdone = 100.0*(vres-1-ypos)/vres; |
| 432 |
< |
if (ralrm > 0 && time((long *)0) >= tlastrept+ralrm) |
| 432 |
> |
if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm) |
| 433 |
|
report(); |
| 434 |
|
#ifndef BSD |
| 435 |
|
else |
| 634 |
|
getheader(fp, NULL, NULL); |
| 635 |
|
/* get picture size */ |
| 636 |
|
if (!fscnresolu(&x, &y, fp)) { |
| 637 |
< |
sprintf(errmsg, "bad recover file \"%s\"", oldfile); |
| 637 |
> |
sprintf(errmsg, "bad recover file \"%s\" - not removed", |
| 638 |
> |
oldfile); |
| 639 |
|
error(WARNING, errmsg); |
| 640 |
|
fclose(fp); |
| 641 |
|
return(0); |
