diff options
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/clock_adjtime.c | 73 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/timex.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 1 |
4 files changed, 77 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 0326f92c40..2f2fd5d4d0 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -60,7 +60,7 @@ sysdep_routines += adjtimex clone umount umount2 readahead sysctl \ personality epoll_wait tee vmsplice splice \ open_by_handle_at mlock2 pkey_mprotect pkey_set pkey_get \ timerfd_gettime timerfd_settime prctl \ - process_vm_readv process_vm_writev + process_vm_readv process_vm_writev clock_adjtime CFLAGS-gethostid.c = -fexceptions CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables diff --git a/sysdeps/unix/sysv/linux/clock_adjtime.c b/sysdeps/unix/sysv/linux/clock_adjtime.c new file mode 100644 index 0000000000..764a60b9bf --- /dev/null +++ b/sysdeps/unix/sysv/linux/clock_adjtime.c @@ -0,0 +1,73 @@ +/* clock_adjtime -- tune kernel clock. + Copyright (C) 2020 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; see the file COPYING.LIB. If + not, see <https://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <stdlib.h> +#include <time.h> +#include <sysdep.h> +#include <sys/timex.h> +#include <kernel-features.h> + +int +__clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) +{ +#ifdef __ASSUME_TIME64_SYSCALLS +# ifndef __NR_clock_adjtime64 +# define __NR_clock_adjtime64 __NR_clock_adjtime +# endif + return INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); +#else + int ret = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); + if (errno != ENOSYS) + return ret; + + if (tx64->modes & ADJ_SETOFFSET + && ! in_time_t_range (tx64->time.tv_sec)) + { + __set_errno (EOVERFLOW); + return -1; + } + + struct timex tx32 = valid_timex64_to_timex (*tx64); + int retval = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); + if (retval >= 0) + *tx64 = valid_timex_to_timex64 (tx32); + + return retval; +#endif +} + +#if __TIMESIZE != 64 +libc_hidden_def (__clock_adjtime64) + +int +__clock_adjtime (const clockid_t clock_id, struct timex *tx) +{ + struct __timex64 tx64; + int retval; + + tx64 = valid_timex_to_timex64 (*tx); + retval = __clock_adjtime64 (clock_id, &tx64); + if (retval >= 0) + *tx = valid_timex64_to_timex (tx64); + + return retval; +} +#endif +libc_hidden_def (__clock_adjtime); +strong_alias (__clock_adjtime, clock_adjtime) diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h index 3efe7cd306..2848c5cf76 100644 --- a/sysdeps/unix/sysv/linux/include/sys/timex.h +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -30,6 +30,7 @@ libc_hidden_proto (__adjtimex) /* Local definition of 64 bit time supporting timex struct */ # if __TIMESIZE == 64 # define __timex64 timex +# define __clock_adjtime64 __clock_adjtime # else struct __timex64 @@ -71,6 +72,8 @@ struct __timex64 int :32; int :32; }; +extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64); +libc_hidden_proto (__clock_adjtime64); # endif /* Convert a known valid struct timex into a struct __timex64. */ diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 1d8893d1b8..01ec2bfa95 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -4,7 +4,6 @@ alarm - alarm i:i alarm bdflush EXTRA bdflush i:ii __compat_bdflush bdflush@GLIBC_2.0:GLIBC_2.23 capget EXTRA capget i:pp capget capset EXTRA capset i:pp capset -clock_adjtime EXTRA clock_adjtime i:ip __clock_adjtime clock_adjtime create_module EXTRA create_module 3 __compat_create_module create_module@GLIBC_2.0:GLIBC_2.23 delete_module EXTRA delete_module 3 delete_module epoll_create EXTRA epoll_create i:i epoll_create |