This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH roland/sysconf-clocks] Remove cruft in Linux sysconf for conditional support of monotonic and CPU clocks.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: libc-alpha at sourceware dot org
- Date: Thu, 29 Nov 2012 15:57:54 -0800 (PST)
- Subject: [PATCH roland/sysconf-clocks] Remove cruft in Linux sysconf for conditional support of monotonic and CPU clocks.
Joseph seems to have missed these in his 2012-09-01 change to presume
availability of CPU clocks/timers and his 2012-08-16 change to presume
availability of other clocks/timers.
The only thing I'm not 100% certain of is that all kernel versions we
support (for run-time) supported CLOCK_MONOTONIC on all machines we
support. Can someone check that?
Build-tested x86_64, make check still running (on 3.2.5, so it won't tell
us anything about old-kernel support anyway).
Thanks,
Roland
* sysdeps/unix/sysv/linux/sysconf.c (has_cpuclock): Function removed.
(HAS_CPUCLOCK): Macro removed.
(__sysconf): Return unconditional success for _SC_MONOTONIC_CLOCK,
_SC_CPUTIME, and _SC_THREAD_CPUTIME.
--- a/sysdeps/unix/sysv/linux/sysconf.c
+++ b/sysdeps/unix/sysv/linux/sysconf.c
@@ -34,34 +34,6 @@
static long int posix_sysconf (int name);
-#ifndef HAS_CPUCLOCK
-static long int
-has_cpuclock (int name)
-{
-# if defined __NR_clock_getres || HP_TIMING_AVAIL
- /* If we have HP_TIMING, we will fall back on that if the system
- call does not work, so we support it either way. */
-# if !HP_TIMING_AVAIL
- /* Check using the clock_getres system call. */
- struct timespec ts;
- INTERNAL_SYSCALL_DECL (err);
- int r = INTERNAL_SYSCALL (clock_getres, err, 2,
- (name == _SC_CPUTIME
- ? CLOCK_PROCESS_CPUTIME_ID
- : CLOCK_THREAD_CPUTIME_ID),
- &ts);
- if (INTERNAL_SYSCALL_ERROR_P (r, err))
- return -1;
-# endif
- return _POSIX_VERSION;
-# else
- return -1;
-# endif
-}
-# define HAS_CPUCLOCK(name) has_cpuclock (name)
-#endif
-
-
/* Get the value of the system variable NAME. */
long int
__sysconf (int name)
@@ -71,21 +43,11 @@ __sysconf (int name)
switch (name)
{
struct rlimit rlimit;
-#ifdef __NR_clock_getres
- case _SC_MONOTONIC_CLOCK:
- /* Check using the clock_getres system call. */
- {
- struct timespec ts;
- INTERNAL_SYSCALL_DECL (err);
- int r;
- r = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts);
- return INTERNAL_SYSCALL_ERROR_P (r, err) ? -1 : _POSIX_VERSION;
- }
-#endif
+ case _SC_MONOTONIC_CLOCK:
case _SC_CPUTIME:
case _SC_THREAD_CPUTIME:
- return HAS_CPUCLOCK (name);
+ return _POSIX_VERSION;
case _SC_ARG_MAX:
#if !__ASSUME_ARG_MAX_STACK_BASED