aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2019-08-28 08:25:49 -0400
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-10-30 17:05:14 -0300
commitc3f9aef063cd9d5911e20d4f2b919ff2914c7965 (patch)
treebe4e804c1cef9e7be1b37e09de8d8f5e9b7dec08 /time
parent12cbde1dae6fa4a9a792b64564c7e0debf7544cc (diff)
downloadglibc-c3f9aef063cd9d5911e20d4f2b919ff2914c7965.zip
glibc-c3f9aef063cd9d5911e20d4f2b919ff2914c7965.tar.gz
glibc-c3f9aef063cd9d5911e20d4f2b919ff2914c7965.tar.bz2
Use clock_settime to implement settimeofday.
Unconditionally, on all ports, use clock_settime to implement settimeofday. Remove sysdeps/unix/clock_settime.c, which implemented clock_settime by calling settimeofday; new OS ports must henceforth provide a real implementation of clock_settime. Hurd had a real implementation of settimeofday but not of clock_settime; this patch converts it into an implementation of clock_settime. It only supports CLOCK_REALTIME and microsecond resolution; Hurd/Mach does not appear to have any support for finer-resolution clocks. The vestigial "set time zone" feature of settimeofday complicates the generic settimeofday implementation a little. The only remaining uses of this feature that aren't just bugs, are using it to inform the Linux kernel of the offset between the hardware clock and UTC, on systems where the hardware clock doesn't run in UTC (usually because of dual-booting with Windows). There currently isn't any other way to do this. However, the callers that do this call settimeofday with _only_ the timezone argument non-NULL. Therefore, glibc's new behavior is: callers of settimeofday must supply one and only one of the two arguments. If both arguments are non-NULL, or both arguments are NULL, the call fails and sets errno to EINVAL. When only the timeval argument is supplied, settimeofday calls __clock_settime(CLOCK_REALTIME), same as stime. When only the timezone argument is supplied, settimeofday calls a new internal function called __settimezone. On Linux, only, this function will pass the timezone structure to the settimeofday system call. On all other operating systems, and on Linux architectures that don't define __NR_settimeofday, __settimezone is a stub that always sets errno to ENOSYS and returns -1. The settimeoday syscall is enabled on Linux by the flag COMPAT_32BIT_TIME, which is an option to either 32-bits ABIs or COMPAT builds (defined usually by 64-bit kernels that want to support 32-bit ABIs, such as x86). The idea to future 64-bit time_t only ABIs is to not provide settimeofday syscall. The same semantics are implemented for Linux/Alpha's GLIBC_2.0 compat symbol for settimeofday. There are no longer any internal callers of __settimeofday, so the internal prototype is removed. Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'time')
-rw-r--r--time/Makefile8
-rw-r--r--time/settimeofday.c24
-rw-r--r--time/settimezone.c28
3 files changed, 52 insertions, 8 deletions
diff --git a/time/Makefile b/time/Makefile
index ad8844e..6de4e41 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -31,13 +31,13 @@ headers := time.h sys/time.h sys/timeb.h bits/time.h \
routines := offtime asctime clock ctime ctime_r difftime \
gmtime localtime mktime time \
- gettimeofday settimeofday adjtime tzset \
- tzfile getitimer setitimer \
+ gettimeofday settimeofday settimezone \
+ adjtime tzset tzfile getitimer setitimer \
stime dysize timegm ftime \
getdate strptime strptime_l \
strftime wcsftime strftime_l wcsftime_l \
- timespec_get \
- clock_getcpuclockid clock_getres \
+ timespec_get \
+ clock_getcpuclockid clock_getres \
clock_gettime clock_settime clock_nanosleep
aux := era alt_digit lc-time-cleanup
diff --git a/time/settimeofday.c b/time/settimeofday.c
index 6aa4832..ad57ad4 100644
--- a/time/settimeofday.c
+++ b/time/settimeofday.c
@@ -16,6 +16,7 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
+#include <time.h>
#include <sys/time.h>
/* Set the current time of day and timezone information.
@@ -23,9 +24,24 @@
int
__settimeofday (const struct timeval *tv, const struct timezone *tz)
{
- __set_errno (ENOSYS);
- return -1;
+ if (__glibc_unlikely (tz != 0))
+ {
+ if (tv != 0)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+ return __settimezone (tz);
+ }
+
+ struct timespec ts;
+ TIMEVAL_TO_TIMESPEC (tv, &ts);
+ return __clock_settime (CLOCK_REALTIME, &ts);
}
-stub_warning (settimeofday)
-weak_alias (__settimeofday, settimeofday)
+#ifdef VERSION_settimeofday
+weak_alias (__settimeofday, __settimeofday_w);
+default_symbol_version (__settimeofday_w, settimeofday, VERSION_settimeofday);
+#else
+weak_alias (__settimeofday, settimeofday);
+#endif
diff --git a/time/settimezone.c b/time/settimezone.c
new file mode 100644
index 0000000..b9969c9
--- /dev/null
+++ b/time/settimezone.c
@@ -0,0 +1,28 @@
+/* Copyright (C) 2019 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, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <sys/time.h>
+
+/* Set the system-wide timezone.
+ This call is restricted to the super-user. */
+int
+__settimezone (const struct timezone *tz)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}