diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-10-04 19:28:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-10-04 19:28:07 +0000 |
| commit | 94d824f920209243c72eb4a6fedbb5a039be2af3 (patch) | |
| tree | bbd2b74f817b833d5b7e4c776927329bec5d353e /sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c | |
| parent | 3078cba2f7272dab753c45b733af2e693e86d83c (diff) | |
| download | glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.tar glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.tar.gz glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.tar.bz2 glibc-94d824f920209243c72eb4a6fedbb5a039be2af3.zip | |
Update.
* sysdeps/unix/sysv/linux/ia64/sysconf.c: New file.
* sysdeps/unix/sysv/linux/ia64/Dist: Add has_cpuclock.c.
* sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c: Move actual
testing code to...
* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: ...here. New file.
* sysdeps/unix/sysv/linux/i386/sysconf.c: Add dynamic check for
_SC_CPUTIME and _SC_THREAD_CPUTIME.
Diffstat (limited to 'sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c index 68e5763a8c..229f93d67d 100644 --- a/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/ia64/clock_getcpuclockid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2003, 2004 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 @@ -24,6 +24,9 @@ #include <fcntl.h> +#include "has_cpuclock.c" + + int clock_getcpuclockid (pid_t pid, clockid_t *clock_id) { @@ -31,30 +34,7 @@ clock_getcpuclockid (pid_t pid, clockid_t *clock_id) if (pid != 0 && pid != getpid ()) return EPERM; - static int itc_usable; - int retval = ENOENT; - - if (__builtin_expect (itc_usable == 0, 0)) - { - int newval = 1; - int fd = open ("/proc/sal/itc_drift", O_RDONLY); - if (__builtin_expect (fd != -1, 1)) - { - char buf[16]; - /* We expect the file to contain a single digit followed by - a newline. If the format changes we better not rely on - the file content. */ - if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0' - || buf[1] != '\n') - newval = -1; - - close (fd); - } - - itc_usable = newval; - } - - if (itc_usable > 0) + if (has_cpuclock () > 0) { /* Store the number. */ *clock_id = CLOCK_PROCESS_CPUTIME_ID; |