diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-01-06 23:31:14 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-01-15 20:01:35 +0000 |
| commit | 8ff62fe8dcefc3a0766ae2cac03033d9cf64e7fa (patch) | |
| tree | 48b8285d360ae47691a38e45d684c762e7b00c9f /librt/clock_nanosleep.c | |
| parent | 91daab6288ab3b2b0571c84ba94e029e7e7308dc (diff) | |
rt: cleanup and allow to build for linuxthreads
It seems there is no real dependency to NPTL for these clock_*
functions when UCLIBC_ADVANCED_REALTIME is enabled.
No regressions found.
Reported-by: Baruch Siach <baruch@tkos.co.il>
Diffstat (limited to 'librt/clock_nanosleep.c')
| -rw-r--r-- | librt/clock_nanosleep.c | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/librt/clock_nanosleep.c b/librt/clock_nanosleep.c index 235e8b563..4cf1e06b4 100644 --- a/librt/clock_nanosleep.c +++ b/librt/clock_nanosleep.c @@ -1,5 +1,4 @@ -/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. +/* Copyright (C) 2003-2018 Free Software Foundation, Inc. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,18 +16,17 @@ #include <time.h> #include <errno.h> +#include <cancel.h> +#include <sys/syscall.h> -#include <sysdep-cancel.h> -#include <bits/kernel-features.h> #include "kernel-posix-cpu-timers.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) + struct timespec *rem) { INTERNAL_SYSCALL_DECL (err); int r; @@ -53,43 +51,3 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, 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) \ - { \ - clockid_t syscall_clockid; \ - INTERNAL_SYSCALL_DECL (err); \ - \ - if (clock_id == CLOCK_THREAD_CPUTIME_ID) \ - return EINVAL; \ - if (clock_id == CLOCK_PROCESS_CPUTIME_ID) \ - syscall_clockid = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED); \ - else \ - syscall_clockid = clock_id; \ - \ - int oldstate = LIBC_CANCEL_ASYNC (); \ - \ - int r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, \ - syscall_clockid, flags, req, rem); \ - \ - LIBC_CANCEL_RESET (oldstate); \ - \ - 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 |