* sysdeps/unix/sysv/linux/i386/get_clockfreq.c (__get_clockfreq):
	Handle kernels which report only three digits after the decimal point.
	Reported by Van Okamura <van.okamura@oracle.com>.
This commit is contained in:
Ulrich Drepper 2001-04-18 04:49:34 +00:00
parent ddad941ea4
commit 0160829281
3 changed files with 19 additions and 3 deletions

View File

@ -1,5 +1,9 @@
2001-04-17 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/get_clockfreq.c (__get_clockfreq):
Handle kernels which report only three digits after the decimal point.
Reported by Van Okamura <van.okamura@oracle.com>.
* sysdeps/alpha/fpu/libm-test-ulps: Adjust error values for atan2f.
2001-04-17 David S. Miller <davem@redhat.com>

View File

@ -770,8 +770,8 @@ idouble: 1
ifloat: 2
Function: "atan2":
float: 3
ifloat: 3
float: 4
ifloat: 4
Function: "atanh":
double: 1

View File

@ -1,5 +1,5 @@
/* Get frequency of the system processor. i386/Linux version.
Copyright (C) 2000 Free Software Foundation, Inc.
Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -30,6 +30,8 @@ __get_clockfreq (void)
/* We read the information from the /proc filesystem. It contains at
least one line like
cpu MHz : 497.840237
or also
cpu MHz : 497.841
We search for this line and convert the number in an integer. */
static unsigned long long int result;
int fd;
@ -54,6 +56,8 @@ __get_clockfreq (void)
if (__builtin_expect (mhz != NULL, 1))
{
char *endp = buf + n;
int seen_decpoint = 0;
int ndigits = 0;
/* Search for the beginning of the string. */
while (mhz < endp && (*mhz < '0' || *mhz > '9') && *mhz != '\n')
@ -65,10 +69,18 @@ __get_clockfreq (void)
{
result *= 10;
result += *mhz - '0';
if (seen_decpoint)
++ndigits;
}
else if (*mhz == '.')
seen_decpoint = 1;
++mhz;
}
/* Compensate for missing digits at the end. */
while (ndigits++ < 6)
result *= 10;
}
}