mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
5a82c74822
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
68 lines
2.5 KiB
C
68 lines
2.5 KiB
C
/* Copyright (C) 2008-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/times.h>
|
|
#include <sysdep.h>
|
|
|
|
|
|
clock_t
|
|
__times (struct tms *buf)
|
|
{
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
clock_t ret = INTERNAL_SYSCALL (times, err, 1, buf);
|
|
if (INTERNAL_SYSCALL_ERROR_P (ret, err)
|
|
&& __builtin_expect (INTERNAL_SYSCALL_ERRNO (ret, err) == EFAULT, 0)
|
|
&& buf)
|
|
{
|
|
/* This might be an error or not. For architectures which have no
|
|
separate return value and error indicators we cannot
|
|
distinguish a return value of e.g. (clock_t) -14 from -EFAULT.
|
|
Therefore the only course of action is to dereference the user
|
|
-supplied structure on a return of (clock_t) -14. This will crash
|
|
applications which pass in an invalid non-NULL BUF pointer.
|
|
Note that Linux allows BUF to be NULL in which case we skip this. */
|
|
#define touch(v) \
|
|
do { \
|
|
clock_t temp = v; \
|
|
asm volatile ("" : "+r" (temp)); \
|
|
v = temp; \
|
|
} while (0)
|
|
touch (buf->tms_utime);
|
|
touch (buf->tms_stime);
|
|
touch (buf->tms_cutime);
|
|
touch (buf->tms_cstime);
|
|
|
|
/* If we come here the memory is valid and the kernel did not
|
|
return an EFAULT error, but rather e.g. (clock_t) -14.
|
|
Return the value given by the kernel. */
|
|
}
|
|
|
|
/* On Linux this function never fails except with EFAULT.
|
|
POSIX says that returning a value (clock_t) -1 indicates an error,
|
|
but on Linux this is simply one of the valid clock values after
|
|
clock_t wraps. Therefore when we would return (clock_t) -1, we
|
|
instead return (clock_t) 0, and loose a tick of accuracy (having
|
|
returned 0 for two consecutive calls even though the clock
|
|
advanced). */
|
|
if (ret == (clock_t) -1)
|
|
return (clock_t) 0;
|
|
|
|
return ret;
|
|
}
|
|
weak_alias (__times, times)
|