From 5cd278f39919dc2c8ff16d5b74e096cf3cafba32 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Tue, 23 Sep 1997 07:06:54 +0000 Subject: [PATCH] dtime_.c (G77_dtime_0): Fix types in HAVE_GETRUSAGE case so as not to truncate results to integer values. * libU77/dtime_.c (G77_dtime_0): Fix types in HAVE_GETRUSAGE case so as not to truncate results to integer values. * libU77/Version.c: Bump. From-SVN: r15669 --- gcc/f/runtime/ChangeLog.egcs | 6 ++++++ gcc/f/runtime/libU77/Version.c | 4 ++-- gcc/f/runtime/libU77/dtime_.c | 14 ++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/gcc/f/runtime/ChangeLog.egcs b/gcc/f/runtime/ChangeLog.egcs index 575e343d5f0..0627d937acf 100644 --- a/gcc/f/runtime/ChangeLog.egcs +++ b/gcc/f/runtime/ChangeLog.egcs @@ -1,3 +1,9 @@ +1997-09-19 Dave Love + + * libU77/dtime_.c (G77_dtime_0): Fix types in HAVE_GETRUSAGE case + so as not to truncate results to integer values. + * libU77/Version.c: Bump. + Thu Sep 18 16:58:46 1997 Jeffrey A Law (law@cygnus.com) * Makefile.in (stamp-lib): Don't use '$?', explicitly diff --git a/gcc/f/runtime/libU77/Version.c b/gcc/f/runtime/libU77/Version.c index 88a2907c217..0a278382f51 100644 --- a/gcc/f/runtime/libU77/Version.c +++ b/gcc/f/runtime/libU77/Version.c @@ -1,6 +1,6 @@ -static char junk[] = "\n@(#) LIBU77 VERSION 19970609\n"; +static char junk[] = "\n@(#) LIBU77 VERSION 19970919\n"; -char __G77_LIBU77_VERSION__[] = "0.5.21"; +char __G77_LIBU77_VERSION__[] = "0.5.22-970919"; #include diff --git a/gcc/f/runtime/libU77/dtime_.c b/gcc/f/runtime/libU77/dtime_.c index dc0accbfdf0..9569db3fae0 100644 --- a/gcc/f/runtime/libU77/dtime_.c +++ b/gcc/f/runtime/libU77/dtime_.c @@ -43,21 +43,23 @@ double G77_dtime_0 (tarray) double G77_dtime_0 (real tarray[2]) #endif { - time_t utime, stime; - static time_t old_utime = 0, old_stime = 0; /* The getrusage version is only the default for convenience. */ #ifdef HAVE_GETRUSAGE + float utime, stime; + static float old_utime = 0.0, old_stime = 0.0; struct rusage rbuff; if (getrusage (RUSAGE_SELF, &rbuff) != 0) abort (); - utime = ((float) (rbuff.ru_utime).tv_sec + - (float) (rbuff.ru_utime).tv_usec/1000000.0); + utime = (float) (rbuff.ru_utime).tv_sec + + (float) (rbuff.ru_utime).tv_usec/1000000.0; tarray[0] = utime - (float) old_utime; - stime = ((float) (rbuff.ru_stime).tv_sec + - (float) (rbuff.ru_stime).tv_usec/1000000.0); + stime = (float) (rbuff.ru_stime).tv_sec + + (float) (rbuff.ru_stime).tv_usec/1000000.0; tarray[1] = stime - old_stime; #else /* HAVE_GETRUSAGE */ + time_t utime, stime; + static time_t old_utime = 0, old_stime = 0; struct tms buffer; /* NeXTStep seems to define _SC_CLK_TCK but not to have sysconf;