diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/sysconf.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysconf.c | 64 |
1 files changed, 15 insertions, 49 deletions
diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index 4b297ba35f..2492d7a291 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -35,34 +35,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,29 +43,20 @@ __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_CPUTIME: case _SC_THREAD_CPUTIME: - return HAS_CPUCLOCK (name); + return _POSIX_VERSION; case _SC_ARG_MAX: - /* Use getrlimit to get the stack limit. */ - if (__getrlimit (RLIMIT_STACK, &rlimit) == 0) - return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4); + { + struct rlimit rlimit; + /* Use getrlimit to get the stack limit. */ + if (__getrlimit (RLIMIT_STACK, &rlimit) == 0) + return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4); - return legacy_ARG_MAX; + return legacy_ARG_MAX; + } case _SC_NGROUPS_MAX: /* Try to read the information from the /proc/sys/kernel/ngroups_max @@ -102,11 +65,14 @@ __sysconf (int name) break; case _SC_SIGQUEUE_MAX: - if (__getrlimit (RLIMIT_SIGPENDING, &rlimit) == 0) - return rlimit.rlim_cur; + { + struct rlimit rlimit; + if (__getrlimit (RLIMIT_SIGPENDING, &rlimit) == 0) + return rlimit.rlim_cur; - /* The /proc/sys/kernel/rtsig-max file contains the answer. */ - procfname = "/proc/sys/kernel/rtsig-max"; + /* The /proc/sys/kernel/rtsig-max file contains the answer. */ + procfname = "/proc/sys/kernel/rtsig-max"; + } break; default: |