2005-04-27 08:01:41 +00:00
|
|
|
/* clock_getcpuclockid -- Get a clockid_t for process CPU time. Linux version.
|
2020-01-01 00:14:33 +00:00
|
|
|
Copyright (C) 2004-2020 Free Software Foundation, Inc.
|
2005-04-27 08:01:41 +00:00
|
|
|
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
|
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/>. */
|
2005-04-27 08:01:41 +00:00
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include "kernel-posix-cpu-timers.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
|
|
|
|
|
|
|
|
int
|
2013-06-11 05:41:11 +00:00
|
|
|
__clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
|
2005-04-27 08:01:41 +00:00
|
|
|
{
|
|
|
|
|
/* The clockid_t value is a simple computation from the PID.
|
|
|
|
|
But we do a clock_getres call to validate it. */
|
|
|
|
|
|
|
|
|
|
const clockid_t pidclock = MAKE_PROCESS_CPUCLOCK (pid, CPUCLOCK_SCHED);
|
|
|
|
|
|
2020-01-29 20:38:36 +00:00
|
|
|
int r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL);
|
|
|
|
|
if (!INTERNAL_SYSCALL_ERROR_P (r))
|
2005-04-27 08:01:41 +00:00
|
|
|
{
|
2012-09-01 21:32:04 +00:00
|
|
|
*clock_id = pidclock;
|
|
|
|
|
return 0;
|
2005-04-27 08:01:41 +00:00
|
|
|
}
|
|
|
|
|
|
2020-01-29 20:38:36 +00:00
|
|
|
if (INTERNAL_SYSCALL_ERRNO (r) == EINVAL)
|
2005-04-27 08:01:41 +00:00
|
|
|
{
|
2012-09-01 21:32:04 +00:00
|
|
|
/* The clock_getres system call checked the PID for us. */
|
|
|
|
|
return ESRCH;
|
2005-04-27 08:01:41 +00:00
|
|
|
}
|
2012-09-01 21:32:04 +00:00
|
|
|
else
|
2020-01-29 20:38:36 +00:00
|
|
|
return INTERNAL_SYSCALL_ERRNO (r);
|
2005-04-27 08:01:41 +00:00
|
|
|
}
|
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_getcpuclockid, clock_getcpuclockid, GLIBC_2_17);
|
|
|
|
|
/* clock_getcpuclockid 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_getcpuclockid, __clock_getcpuclockid_2);
|
|
|
|
|
compat_symbol (libc, __clock_getcpuclockid_2, clock_getcpuclockid, GLIBC_2_2);
|
|
|
|
|
#endif
|
