--- ray/src/rt/rpict.c 1993/11/22 09:34:15 2.32 +++ ray/src/rt/rpict.c 1993/11/24 14:28:08 2.35 @@ -21,7 +21,7 @@ static char SCCSid[] = "$SunId$ LBL"; #else #include #include -#include +#include #endif #endif @@ -140,7 +140,8 @@ report() /* report progress */ #else struct tms tbuf; struct utsname nambuf; -#define hostname nambuf.sysname + double period; +#define hostname nambuf.nodename #endif tlastrept = time((time_t *)NULL); @@ -154,8 +155,9 @@ report() /* report progress */ gethostname(hostname, sizeof(hostname)); #else times(&tbuf); - u = ( tbuf.tms_utime + tbuf.tms_cutime ) / CLK_TCK; - s = ( tbuf.tms_stime + tbuf.tms_cstime ) / CLK_TCK; + period = 1.0 / sysconf(_SC_CLK_TCK); + u = ( tbuf.tms_utime + tbuf.tms_cutime ) * period; + s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period; uname(&nambuf); #endif @@ -164,7 +166,10 @@ report() /* report progress */ nrays, pctdone, u/3600., s/3600., (tlastrept-tstart)/3600., hostname); eputs(errmsg); +#ifndef BSD + signal(SIGCONT, report); #undef hostname +#endif } #else report() /* report progress */ @@ -173,7 +178,6 @@ report() /* report progress */ sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n", nrays, pctdone, (tlastrept-tstart)/3600.0); eputs(errmsg); - signal(SIGCONT, report); } #endif