2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
2000-04-10 06:59:44 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
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.
|
2000-04-10 06:59:44 +00:00
|
|
|
|
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
2000-04-10 06:59:44 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2000-04-10 06:59:44 +00:00
|
|
|
|
|
|
|
#include <errno.h>
|
2001-01-28 00:00:08 +00:00
|
|
|
#include <time.h>
|
Use clock_gettime to implement gettimeofday.
Consolidate generic gettimeofday implementation to use clock_gettime.
Linux ports that still provide gettimeofday through vDSO are not
changed.
Remove sysdeps/unix/clock_gettime.c, which implemented clock_gettime
using gettimeofday; new OS ports must provide a real implementation of
clock_gettime.
Rename sysdeps/mach/gettimeofday.c to sysdeps/mach/clock_gettime.c and
convert into an implementation of clock_gettime. It only supports
CLOCK_REALTIME; Mach does not appear to have any support for monotonic
clocks. It uses __host_get_time, which provides at best microsecond
resolution. Hurd is currently using sysdeps/posix/clock_getres.c for
clock_getres; its output for CLOCK_REALTIME is based on
sysconf (_SC_CLK_TCK), and I do not know whether that gives the
correct result.
Unlike settimeofday, there are no known uses of gettimeofday's
vestigial "get time zone" feature that are not bugs. (The per-process
timezone support in localtime and friends is unrelated, and the
programs that set the kernel's offset between the hardware clock and
UTC do not need to read it back.) Therefore, this feature is dummied
out. Henceforth, if gettimeofday's "struct timezone" argument is not
NULL, it will write zeroes to both fields. Any program that is
actually looking at this data will thus think it is running in UTC,
which is probably more correct than whatever it was doing before.
[__]gettimeofday no longer has any internal callers, so we can now
remove its internal prototype and PLT bypass aliases. The
__gettimeofday@GLIBC_2.0 export remains, in case it is used by any
third-party code.
It also allows to simplify the arch-specific implementation on x86 and
powerpc to remove the hack to disable the internal route to non iFUNC
variant for internal symbol.
This patch also fixes a missing optimization on aarch64, powerpc, and
x86 where the code used on static build do not use the vDSO.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Co-authored-by: Zack Weinberg <zackw@panix.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-10-24 19:19:33 +00:00
|
|
|
#include <mach.h>
|
Finish move of clock_* functions to libc. [BZ #24959]
In glibc 2.17, the functions clock_getcpuclockid, clock_getres,
clock_gettime, clock_nanosleep, and clock_settime were moved from
librt.so to libc.so, leaving compatibility stubs behind. Now that the
dynamic linker no longer insists on finding versioned symbols in the
same library that originally defined them, we do not need the stubs
anymore, and this means we don't need GLIBC_PRIVATE __-prefix aliases
for most of the functions anymore either. (clock_gettime still needs
one.) For ports added before 2.17, libc.so needs to provide two
symbol versions for each, the default at GLIBC_2.17 plus a compat
version matching what librt had.
While I'm at it, move the clock_*.c files and their tests from rt/ to
time/.
2019-09-04 06:18:57 +00:00
|
|
|
#include <shlib-compat.h>
|
2005-04-27 08:01:41 +00:00
|
|
|
|
Use clock_gettime to implement gettimeofday.
Consolidate generic gettimeofday implementation to use clock_gettime.
Linux ports that still provide gettimeofday through vDSO are not
changed.
Remove sysdeps/unix/clock_gettime.c, which implemented clock_gettime
using gettimeofday; new OS ports must provide a real implementation of
clock_gettime.
Rename sysdeps/mach/gettimeofday.c to sysdeps/mach/clock_gettime.c and
convert into an implementation of clock_gettime. It only supports
CLOCK_REALTIME; Mach does not appear to have any support for monotonic
clocks. It uses __host_get_time, which provides at best microsecond
resolution. Hurd is currently using sysdeps/posix/clock_getres.c for
clock_getres; its output for CLOCK_REALTIME is based on
sysconf (_SC_CLK_TCK), and I do not know whether that gives the
correct result.
Unlike settimeofday, there are no known uses of gettimeofday's
vestigial "get time zone" feature that are not bugs. (The per-process
timezone support in localtime and friends is unrelated, and the
programs that set the kernel's offset between the hardware clock and
UTC do not need to read it back.) Therefore, this feature is dummied
out. Henceforth, if gettimeofday's "struct timezone" argument is not
NULL, it will write zeroes to both fields. Any program that is
actually looking at this data will thus think it is running in UTC,
which is probably more correct than whatever it was doing before.
[__]gettimeofday no longer has any internal callers, so we can now
remove its internal prototype and PLT bypass aliases. The
__gettimeofday@GLIBC_2.0 export remains, in case it is used by any
third-party code.
It also allows to simplify the arch-specific implementation on x86 and
powerpc to remove the hack to disable the internal route to non iFUNC
variant for internal symbol.
This patch also fixes a missing optimization on aarch64, powerpc, and
x86 where the code used on static build do not use the vDSO.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Co-authored-by: Zack Weinberg <zackw@panix.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-10-24 19:19:33 +00:00
|
|
|
/* Get the current time of day, putting it into *TS.
|
|
|
|
Returns 0 on success, -1 on errors. */
|
2000-04-10 06:59:44 +00:00
|
|
|
int
|
Use clock_gettime to implement gettimeofday.
Consolidate generic gettimeofday implementation to use clock_gettime.
Linux ports that still provide gettimeofday through vDSO are not
changed.
Remove sysdeps/unix/clock_gettime.c, which implemented clock_gettime
using gettimeofday; new OS ports must provide a real implementation of
clock_gettime.
Rename sysdeps/mach/gettimeofday.c to sysdeps/mach/clock_gettime.c and
convert into an implementation of clock_gettime. It only supports
CLOCK_REALTIME; Mach does not appear to have any support for monotonic
clocks. It uses __host_get_time, which provides at best microsecond
resolution. Hurd is currently using sysdeps/posix/clock_getres.c for
clock_getres; its output for CLOCK_REALTIME is based on
sysconf (_SC_CLK_TCK), and I do not know whether that gives the
correct result.
Unlike settimeofday, there are no known uses of gettimeofday's
vestigial "get time zone" feature that are not bugs. (The per-process
timezone support in localtime and friends is unrelated, and the
programs that set the kernel's offset between the hardware clock and
UTC do not need to read it back.) Therefore, this feature is dummied
out. Henceforth, if gettimeofday's "struct timezone" argument is not
NULL, it will write zeroes to both fields. Any program that is
actually looking at this data will thus think it is running in UTC,
which is probably more correct than whatever it was doing before.
[__]gettimeofday no longer has any internal callers, so we can now
remove its internal prototype and PLT bypass aliases. The
__gettimeofday@GLIBC_2.0 export remains, in case it is used by any
third-party code.
It also allows to simplify the arch-specific implementation on x86 and
powerpc to remove the hack to disable the internal route to non iFUNC
variant for internal symbol.
This patch also fixes a missing optimization on aarch64, powerpc, and
x86 where the code used on static build do not use the vDSO.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Co-authored-by: Zack Weinberg <zackw@panix.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-10-24 19:19:33 +00:00
|
|
|
__clock_gettime (clockid_t clock_id, struct timespec *ts)
|
2000-04-10 06:59:44 +00:00
|
|
|
{
|
2020-10-11 13:59:01 +00:00
|
|
|
mach_msg_type_number_t count;
|
|
|
|
error_t err;
|
|
|
|
|
|
|
|
switch (clock_id) {
|
|
|
|
|
|
|
|
case CLOCK_REALTIME:
|
|
|
|
{
|
|
|
|
/* __host_get_time can only fail if passed an invalid host_t.
|
|
|
|
__mach_host_self could theoretically fail (producing an
|
|
|
|
invalid host_t) due to resource exhaustion, but we assume
|
|
|
|
this will never happen. */
|
|
|
|
time_value_t tv;
|
|
|
|
__host_get_time (__mach_host_self (), &tv);
|
|
|
|
TIME_VALUE_TO_TIMESPEC (&tv, ts);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CLOCK_PROCESS_CPUTIME_ID:
|
|
|
|
{
|
|
|
|
struct time_value t = { .seconds = 0, .microseconds = 0 };
|
|
|
|
struct task_basic_info bi;
|
|
|
|
struct task_thread_times_info tti;
|
|
|
|
|
|
|
|
/* Dead threads CPU time. */
|
|
|
|
count = TASK_BASIC_INFO_COUNT;
|
|
|
|
err = __task_info (__mach_task_self (), TASK_BASIC_INFO,
|
|
|
|
(task_info_t) &bi, &count);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
__set_errno(err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
time_value_add (&t, &bi.user_time);
|
|
|
|
time_value_add (&t, &bi.system_time);
|
|
|
|
|
|
|
|
/* Live threads CPU time. */
|
|
|
|
count = TASK_EVENTS_INFO_COUNT;
|
|
|
|
err = __task_info (__mach_task_self (), TASK_THREAD_TIMES_INFO,
|
|
|
|
(task_info_t) &tti, &count);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
__set_errno(err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
time_value_add (&t, &tti.user_time);
|
|
|
|
time_value_add (&t, &tti.system_time);
|
|
|
|
|
|
|
|
TIME_VALUE_TO_TIMESPEC(&t, ts);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CLOCK_THREAD_CPUTIME_ID:
|
|
|
|
{
|
|
|
|
struct thread_basic_info bi;
|
|
|
|
mach_port_t self = __mach_thread_self ();
|
|
|
|
|
|
|
|
count = THREAD_BASIC_INFO_COUNT;
|
|
|
|
err = __thread_info (self, THREAD_BASIC_INFO,
|
|
|
|
(thread_info_t) &bi, &count);
|
|
|
|
__mach_port_deallocate (__mach_task_self (), self);
|
|
|
|
if (err)
|
|
|
|
{
|
|
|
|
__set_errno(err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
time_value_add (&bi.user_time, &bi.system_time);
|
|
|
|
|
|
|
|
TIME_VALUE_TO_TIMESPEC(&bi.user_time, ts);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
2000-04-10 06:59:44 +00:00
|
|
|
}
|
2013-06-11 05:41:11 +00:00
|
|
|
libc_hidden_def (__clock_gettime)
|
Finish move of clock_* functions to libc. [BZ #24959]
In glibc 2.17, the functions clock_getcpuclockid, clock_getres,
clock_gettime, clock_nanosleep, and clock_settime were moved from
librt.so to libc.so, leaving compatibility stubs behind. Now that the
dynamic linker no longer insists on finding versioned symbols in the
same library that originally defined them, we do not need the stubs
anymore, and this means we don't need GLIBC_PRIVATE __-prefix aliases
for most of the functions anymore either. (clock_gettime still needs
one.) For ports added before 2.17, libc.so needs to provide two
symbol versions for each, the default at GLIBC_2.17 plus a compat
version matching what librt had.
While I'm at it, move the clock_*.c files and their tests from rt/ to
time/.
2019-09-04 06:18:57 +00:00
|
|
|
|
|
|
|
versioned_symbol (libc, __clock_gettime, clock_gettime, GLIBC_2_17);
|
|
|
|
/* clock_gettime moved to libc in version 2.17;
|
|
|
|
old binaries may expect the symbol version it had in librt. */
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_17)
|
|
|
|
strong_alias (__clock_gettime, __clock_gettime_2);
|
|
|
|
compat_symbol (libc, __clock_gettime_2, clock_gettime, GLIBC_2_2);
|
|
|
|
#endif
|
2020-01-16 13:27:27 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
__clock_gettime64 (clockid_t clock_id, struct __timespec64 *ts64)
|
|
|
|
{
|
|
|
|
struct timespec ts;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = __clock_gettime (clock_id, &ts);
|
|
|
|
if (ret == 0)
|
|
|
|
*ts64 = valid_timespec_to_timespec64 (ts);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
libc_hidden_def (__clock_gettime64)
|