diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-03-03 04:57:09 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-03 04:57:09 +0000 |
commit | ad0e8eb0a565a44fe9616354d4e7556c3df9ae76 (patch) | |
tree | c74ddbeeded7e73a8ec30de6a3387bea066791af /sysdeps/unix/sysv/linux | |
parent | 1e543c0cc620324b04da6891b9b7848da8704411 (diff) | |
download | glibc-ad0e8eb0a565a44fe9616354d4e7556c3df9ae76.tar glibc-ad0e8eb0a565a44fe9616354d4e7556c3df9ae76.tar.gz glibc-ad0e8eb0a565a44fe9616354d4e7556c3df9ae76.tar.bz2 glibc-ad0e8eb0a565a44fe9616354d4e7556c3df9ae76.zip |
Update.
2003-03-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Define
_POSIX_MONOTONIC_CLOCK.
* linuxthreads/sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux')
-rw-r--r-- | sysdeps/unix/sysv/linux/clock_getres.c | 76 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/clock_gettime.c | 76 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/clock_nanosleep.c | 65 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/clock_settime.c | 73 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 8 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sysconf.c | 51 |
6 files changed, 348 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c new file mode 100644 index 0000000000..442fbd5705 --- /dev/null +++ b/sysdeps/unix/sysv/linux/clock_getres.c @@ -0,0 +1,76 @@ +/* Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> + +#include "kernel-features.h" + + +#ifdef __ASSUME_POSIX_TIMERS +/* This means the REALTIME and MONOTONIC clock are definitely + supported in the kernel. */ +# define SYSDEP_GETRES \ + case CLOCK_REALTIME: \ + case CLOCK_MONOTONIC: \ + retval = INLINE_SYSCALL (clock_getres, 2, clock_id, res); \ + break +#elif defined __NR_clock_getres +/* Is the syscall known to exist? */ +extern int __libc_missing_posix_timers attribute_hidden; + +/* The REALTIME and MONOTONIC clock might be available. Try the + syscall first. */ +# define SYSDEP_GETRES \ + case CLOCK_REALTIME: \ + case CLOCK_MONOTONIC: \ + { \ + int e = EINVAL; \ + \ + if (!__libc_missing_posix_timers) \ + { \ + INTERNAL_SYSCALL_DECL (err); \ + int r = INTERNAL_SYSCALL (clock_getres, err, 2, clock_id, res); \ + if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ + { \ + retval = 0; \ + break; \ + } \ + \ + e = INTERNAL_SYSCALL_ERRNO (r, err); \ + if (e == ENOSYS) \ + { \ + __libc_missing_posix_timers = 1; \ + e = EINVAL; \ + } \ + } \ + \ + /* Fallback code. */ \ + if (e == EINVAL && clock_id == CLOCK_REALTIME) \ + HANDLE_REALTIME; \ + else \ + __set_errno (e); \ + } \ + break +#endif + +#ifdef __NR_clock_getres +/* We handled the REALTIME clock here. */ +# define HANDLED_REALTIME 1 +#endif + +#include <sysdeps/posix/clock_getres.c> diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c new file mode 100644 index 0000000000..522fac32a7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/clock_gettime.c @@ -0,0 +1,76 @@ +/* Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> + +#include "kernel-features.h" + + +#ifdef __ASSUME_POSIX_TIMERS +/* This means the REALTIME and MONOTONIC clock are definitely + supported in the kernel. */ +# define SYSDEP_GETTIME \ + case CLOCK_REALTIME: \ + case CLOCK_MONOTONIC: \ + retval = INLINE_SYSCALL (clock_gettime, 2, clock_id, tp); \ + break +#elif defined __NR_clock_gettime +/* Is the syscall known to exist? */ +int __libc_missing_posix_timers attribute_hidden; + +/* The REALTIME and MONOTONIC clock might be available. Try the + syscall first. */ +# define SYSDEP_GETTIME \ + case CLOCK_REALTIME: \ + case CLOCK_MONOTONIC: \ + { \ + int e = EINVAL; \ + \ + if (!__libc_missing_posix_timers) \ + { \ + INTERNAL_SYSCALL_DECL (err); \ + int r = INTERNAL_SYSCALL (clock_gettime, err, 2, clock_id, tp); \ + if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ + { \ + retval = 0; \ + break; \ + } \ + \ + e = INTERNAL_SYSCALL_ERRNO (r, err); \ + if (e == ENOSYS) \ + { \ + __libc_missing_posix_timers = 1; \ + e = EINVAL; \ + } \ + } \ + \ + /* Fallback code. */ \ + if (e == EINVAL && clock_id == CLOCK_REALTIME) \ + HANDLE_REALTIME; \ + else \ + __set_errno (e); \ + } \ + break +#endif + +#ifdef __NR_clock_gettime +/* We handled the REALTIME clock here. */ +# define HANDLED_REALTIME 1 +#endif + +#include <sysdeps/unix/clock_gettime.c> diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c new file mode 100644 index 0000000000..ceb3801eb9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -0,0 +1,65 @@ +/* Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <time.h> + +#include <sysdep.h> +#include "kernel-features.h" + + +#ifdef __ASSUME_POSIX_TIMERS +/* We can simply use the syscall. The CPU clocks are not supported + with this function. */ +int +clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, + struct timespec *rem) +{ + INTERNAL_SYSCALL_DECL (err); + int r; + + r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, req, rem); + return (INTERNAL_SYSCALL_ERROR_P (r, err) + ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); +} + +#else +# ifdef __NR_clock_nanosleep +/* Is the syscall known to exist? */ +extern int __libc_missing_posix_timers attribute_hidden; + +/* The REALTIME and MONOTONIC clock might be available. Try the + syscall first. */ +# define SYSDEP_NANOSLEEP \ + if (!__libc_missing_posix_timers) \ + { \ + INTERNAL_SYSCALL_DECL (err); \ + int r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags, \ + req, rem); \ + \ + if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ + return 0; \ + \ + if (INTERNAL_SYSCALL_ERRNO (r, err) != ENOSYS) \ + return INTERNAL_SYSCALL_ERRNO (r, err); \ + \ + __libc_missing_posix_timers = 1; \ + } +# endif + +# include <sysdeps/unix/clock_nanosleep.c> +#endif diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c new file mode 100644 index 0000000000..d57c70e5e1 --- /dev/null +++ b/sysdeps/unix/sysv/linux/clock_settime.c @@ -0,0 +1,73 @@ +/* Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> + +#include "kernel-features.h" + + +#ifdef __ASSUME_POSIX_TIMERS +/* This means the REALTIME clock is definitely supported in the + kernel. */ +# define SYSDEP_SETTIME \ + case CLOCK_REALTIME: \ + retval = INLINE_SYSCALL (clock_settime, 2, clock_id, tp); \ + break +#elif defined __NR_clock_settime +/* Is the syscall known to exist? */ +extern int __libc_missing_posix_timers attribute_hidden; + +/* The REALTIME clock might be available. Try the syscall first. */ +# define SYSDEP_SETTIME \ + case CLOCK_REALTIME: \ + { \ + int e = EINVAL; \ + \ + if (!__libc_missing_posix_timers) \ + { \ + INTERNAL_SYSCALL_DECL (err); \ + int r = INTERNAL_SYSCALL (clock_settime, err, 2, clock_id, tp); \ + if (!INTERNAL_SYSCALL_ERROR_P (r, err)) \ + { \ + retval = 0; \ + break; \ + } \ + \ + e = INTERNAL_SYSCALL_ERRNO (r, err); \ + if (e == ENOSYS) \ + { \ + __libc_missing_posix_timers = 1; \ + e = EINVAL; \ + } \ + } \ + \ + /* Fallback code. */ \ + if (e == EINVAL && clock_id == CLOCK_REALTIME) \ + HANDLE_REALTIME; \ + else \ + __set_errno (e); \ + } \ + break +#endif + +#ifdef __NR_clock_settime +/* We handled the REALTIME clock here. */ +# define HANDLED_REALTIME 1 +#endif + +#include <sysdeps/unix/clock_settime.c> diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 239d6379b4..f9d1f09050 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/kernel-features.h @@ -1,6 +1,6 @@ /* Set flags signalling availability of kernel features based on given kernel version number. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 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 @@ -264,3 +264,9 @@ # define __ASSUME_FCNTL64 1 # define __ASSUME_VFORK_SYSCALL 1 #endif + +/* Beginning with 2.5.63 support for realtime and monotonic clocks and + timers based on them is available. */ +#if __LINUX_KERNEL_VERSION >= 132415 +# define __ASSUME_POSIX_TIMERS 1 +#endif diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c new file mode 100644 index 0000000000..92b1e66782 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -0,0 +1,51 @@ +/* Get file-specific information about a file. Linux version. + Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sysdep.h> +#include <time.h> +#include <unistd.h> + +static long int posix_sysconf (int name); + +/* Define this first, so it can be inlined. */ +#define __sysconf static posix_sysconf +#include <sysdeps/posix/sysconf.c> + + +/* Get the value of the system variable NAME. */ +long int +__sysconf (int name) +{ + switch (name) + { +#ifdef __NR_clock_getres + case _SC_MONOTONIC_CLOCK: + /* Check using the clock_getres system call. */ + { + struct timespec ts; + INTERNAL_SYSCALL_DECL (err); + int r = INTERNAL_SYSCALL (clock_getres, err, 2, CLOCK_MONOTONIC, &ts); + return INTERNAL_SYSCALL_ERROR_P (r, err) ? 0 : 1; + } +#endif + + default: + return posix_sysconf (name); + } +} |