mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
2006-06-08 Joseph Myers <jsm28@gcc.gnu.org> [BZ #2832] * math/gen-libm-test.pl (clean_up_number): Do not remove trailing 0s from integers. 2006-08-13 Ulrich Drepper <drepper@redhat.com> [BZ #2987] * sysdeps/unix/sysv/linux/clock_settime.c: Add code to use syscall for CPU clocks. * sysdeps/unix/clock_settime.c: Add support for platform-specific setting of CPU clocks.
This commit is contained in:
Ulrich Drepper
parent
45698414d3
commit
f99ed76079
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
||||
2006-06-08 Joseph Myers <jsm28@gcc.gnu.org>
|
||||
|
||||
[BZ #2832]
|
||||
* math/gen-libm-test.pl (clean_up_number): Do not remove trailing
|
||||
0s from integers.
|
||||
|
||||
2006-08-13 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
[BZ #2987]
|
||||
* sysdeps/unix/sysv/linux/clock_settime.c: Add code to use syscall
|
||||
for CPU clocks.
|
||||
* sysdeps/unix/clock_settime.c: Add support for platform-specific
|
||||
setting of CPU clocks.
|
||||
|
||||
2006-06-23 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
[BZ #2841]
|
||||
|
||||
@ -558,9 +558,11 @@ sub parse_ulps {
|
||||
sub clean_up_number {
|
||||
my ($number) = @_;
|
||||
|
||||
# Remove trailing zeros
|
||||
$number =~ s/0+$//;
|
||||
$number =~ s/\.$//;
|
||||
# Remove trailing zeros after the decimal point
|
||||
if ($number =~ /\./) {
|
||||
$number =~ s/0+$//;
|
||||
$number =~ s/\.$//;
|
||||
}
|
||||
return $number;
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1999,2000,2001,2002,2003,2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1999-2004, 2006 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
|
||||
@ -36,6 +36,43 @@ extern void __pthread_clock_settime (clockid_t clock_id, hp_timing_t offset)
|
||||
#endif
|
||||
|
||||
|
||||
#if HP_TIMING_AVAIL
|
||||
static int
|
||||
hp_timing_settime (clockid_t clock_id, const struct timespec *tp)
|
||||
{
|
||||
hp_timing_t tsc;
|
||||
hp_timing_t usertime;
|
||||
|
||||
/* First thing is to get the current time. */
|
||||
HP_TIMING_NOW (tsc);
|
||||
|
||||
if (__builtin_expect (freq == 0, 0))
|
||||
{
|
||||
/* This can only happen if we haven't initialized the `freq'
|
||||
variable yet. Do this now. We don't have to protect this
|
||||
code against multiple execution since all of them should lead
|
||||
to the same result. */
|
||||
freq = __get_clockfreq ();
|
||||
if (__builtin_expect (freq == 0, 0))
|
||||
/* Something went wrong. */
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Convert the user-provided time into CPU ticks. */
|
||||
usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull;
|
||||
|
||||
/* Determine the offset and use it as the new base value. */
|
||||
if (clock_id == CLOCK_PROCESS_CPUTIME_ID
|
||||
|| __pthread_clock_settime == NULL)
|
||||
GL(dl_cpuclock_offset) = tsc - usertime;
|
||||
else
|
||||
__pthread_clock_settime (clock_id, tsc - usertime);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* Set CLOCK to value TP. */
|
||||
int
|
||||
clock_settime (clockid_t clock_id, const struct timespec *tp)
|
||||
@ -70,55 +107,22 @@ clock_settime (clockid_t clock_id, const struct timespec *tp)
|
||||
#endif
|
||||
|
||||
default:
|
||||
#if HP_TIMING_AVAIL
|
||||
if ((clock_id & ((1 << CLOCK_IDFIELD_SIZE) - 1))
|
||||
!= CLOCK_THREAD_CPUTIME_ID)
|
||||
#ifdef SYSDEP_SETTIME_CPU
|
||||
SYSDEP_SETTIME_CPU;
|
||||
#endif
|
||||
#ifndef HANDLED_CPUTIME
|
||||
# if HP_TIMING_AVAIL
|
||||
if (CPUCLOCK_WHICH (clock_id) == CLOCK_PROCESS_CPUTIME_ID
|
||||
|| CPUCLOCK_WHICH (clock_id) == CLOCK_THREAD_CPUTIME_ID)
|
||||
retval = hp_timing_settime (clock_id, tp);
|
||||
else
|
||||
# endif
|
||||
{
|
||||
__set_errno (EINVAL);
|
||||
retval = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
#if HP_TIMING_AVAIL
|
||||
/* FALLTHROUGH. */
|
||||
case CLOCK_PROCESS_CPUTIME_ID:
|
||||
{
|
||||
hp_timing_t tsc;
|
||||
hp_timing_t usertime;
|
||||
|
||||
/* First thing is to get the current time. */
|
||||
HP_TIMING_NOW (tsc);
|
||||
|
||||
if (__builtin_expect (freq == 0, 0))
|
||||
{
|
||||
/* This can only happen if we haven't initialized the `freq'
|
||||
variable yet. Do this now. We don't have to protect this
|
||||
code against multiple execution since all of them should
|
||||
lead to the same result. */
|
||||
freq = __get_clockfreq ();
|
||||
if (__builtin_expect (freq == 0, 0))
|
||||
{
|
||||
/* Something went wrong. */
|
||||
retval = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Convert the user-provided time into CPU ticks. */
|
||||
usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull;
|
||||
|
||||
/* Determine the offset and use it as the new base value. */
|
||||
if (clock_id == CLOCK_PROCESS_CPUTIME_ID
|
||||
|| __pthread_clock_settime == NULL)
|
||||
GL(dl_cpuclock_offset) = tsc - usertime;
|
||||
else
|
||||
__pthread_clock_settime (clock_id, tsc - usertime);
|
||||
|
||||
retval = 0;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
break;
|
||||
}
|
||||
|
||||
return retval;
|
||||
|
||||
@ -16,10 +16,65 @@
|
||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <sysdep.h>
|
||||
|
||||
#include "kernel-posix-cpu-timers.h"
|
||||
#include <kernel-features.h>
|
||||
|
||||
#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
|
||||
# undef INTERNAL_VSYSCALL
|
||||
# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
|
||||
# undef INLINE_VSYSCALL
|
||||
# define INLINE_VSYSCALL INLINE_SYSCALL
|
||||
#else
|
||||
# include <bits/libc-vdso.h>
|
||||
#endif
|
||||
|
||||
#if __ASSUME_POSIX_CPU_TIMERS <= 0 && defined __NR_clock_settime
|
||||
extern int __libc_missing_posix_timers attribute_hidden;
|
||||
extern int __libc_missing_posix_cpu_timers attribute_hidden;
|
||||
|
||||
static int
|
||||
maybe_syscall_settime_cpu (clockid_t clock_id, const struct timespec *tp)
|
||||
{
|
||||
int e = EINVAL;
|
||||
|
||||
if (!__libc_missing_posix_cpu_timers)
|
||||
{
|
||||
INTERNAL_SYSCALL_DECL (err);
|
||||
int r = INTERNAL_VSYSCALL (clock_settime, err, 2, clock_id, tp);
|
||||
if (!INTERNAL_SYSCALL_ERROR_P (r, err))
|
||||
return 0;
|
||||
|
||||
e = INTERNAL_SYSCALL_ERRNO (r, err);
|
||||
# ifndef __ASSUME_POSIX_TIMERS
|
||||
if (e == ENOSYS)
|
||||
{
|
||||
__libc_missing_posix_timers = 1;
|
||||
__libc_missing_posix_cpu_timers = 1;
|
||||
e = EINVAL;
|
||||
}
|
||||
else
|
||||
# endif
|
||||
{
|
||||
if (e == EINVAL)
|
||||
{
|
||||
/* Check whether the kernel supports CPU clocks at all.
|
||||
If not, record it for the future. */
|
||||
r = INTERNAL_VSYSCALL (clock_getres, err, 2,
|
||||
MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED),
|
||||
NULL);
|
||||
if (INTERNAL_SYSCALL_ERROR_P (r, err))
|
||||
__libc_missing_posix_cpu_timers = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return e;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __ASSUME_POSIX_TIMERS
|
||||
/* This means the REALTIME clock is definitely supported in the
|
||||
@ -73,4 +128,22 @@ extern int __libc_missing_posix_timers attribute_hidden;
|
||||
# define HANDLED_REALTIME 1
|
||||
#endif
|
||||
|
||||
#if __ASSUME_POSIX_CPU_TIMERS > 0
|
||||
# define HANDLED_CPUTIME 1
|
||||
# define SYSDEP_SETTIME_CPU \
|
||||
retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp)
|
||||
#elif defined __NR_clock_settime
|
||||
# define SYSDEP_SETTIME_CPU \
|
||||
retval = maybe_syscall_settime_cpu (clock_id, tp); \
|
||||
if (retval == 0) \
|
||||
break; \
|
||||
if (retval != EINVAL || !__libc_missing_posix_cpu_timers) \
|
||||
{ \
|
||||
__set_errno (retval); \
|
||||
retval = -1; \
|
||||
break; \
|
||||
} \
|
||||
do { } while (0)
|
||||
#endif
|
||||
|
||||
#include <sysdeps/unix/clock_settime.c>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user