2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
1997-05-26 23:01:17 +00:00
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-05-26 23:01:17 +00:00
|
|
|
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.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-05-26 23:01:17 +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.
|
1995-02-18 01:27:10 +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/>. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <sys/resource.h>
|
2020-10-16 17:51:40 +00:00
|
|
|
#include <shlib-compat.h>
|
|
|
|
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_33)
|
|
|
|
|
|
|
|
/* Granularity of the `vm_utime' and `vm_stime' fields of a `struct vtimes'.
|
|
|
|
(This is the frequency of the machine's power supply, in Hz.) */
|
|
|
|
# define VTIMES_UNITS_PER_SECOND 60
|
|
|
|
|
|
|
|
struct vtimes
|
|
|
|
{
|
|
|
|
/* User time used in units of 1/VTIMES_UNITS_PER_SECOND seconds. */
|
|
|
|
int vm_utime;
|
|
|
|
/* System time used in units of 1/VTIMES_UNITS_PER_SECOND seconds. */
|
|
|
|
int vm_stime;
|
|
|
|
|
|
|
|
/* Amount of data and stack memory used (kilobyte-seconds). */
|
|
|
|
unsigned int vm_idsrss;
|
|
|
|
/* Amount of text memory used (kilobyte-seconds). */
|
|
|
|
unsigned int vm_ixrss;
|
|
|
|
/* Maximum resident set size (text, data, and stack) (kilobytes). */
|
|
|
|
int vm_maxrss;
|
|
|
|
|
|
|
|
/* Number of hard page faults (i.e. those that required I/O). */
|
|
|
|
int vm_majflt;
|
|
|
|
/* Number of soft page faults (i.e. those serviced by reclaiming
|
|
|
|
a page from the list of pages awaiting reallocation. */
|
|
|
|
int vm_minflt;
|
|
|
|
|
|
|
|
/* Number of times a process was swapped out of physical memory. */
|
|
|
|
int vm_nswap;
|
|
|
|
|
|
|
|
/* Number of input operations via the file system. Note: This
|
|
|
|
and `ru_oublock' do not include operations with the cache. */
|
|
|
|
int vm_inblk;
|
|
|
|
/* Number of output operations via the file system. */
|
|
|
|
int vm_oublk;
|
|
|
|
};
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* Return the number of 1/VTIMES_UNITS_PER_SECOND-second
|
|
|
|
units in the `struct timeval' TV. */
|
2020-10-16 17:51:40 +00:00
|
|
|
# define TIMEVAL_TO_VTIMES(tv) \
|
Break some lines before not after operators.
The GNU Coding Standards specify that line breaks in expressions
should go before an operator, not after one. This patch fixes various
code to do this. It only changes code that appears to be mostly
following GNU style anyway, not files and directories with
substantially different formatting. It is not exhaustive even for
files using GNU style (for example, changes to sysdeps files are
deferred for subsequent cleanups). Some files changed are shared with
gnulib, but most are specific to glibc. Changes were made manually,
with places to change found by grep (so some cases, e.g. where the
operator was followed by a comment at end of line, are particularly
liable to have been missed by grep, but I did include cases where the
operator was followed by backslash-newline).
This patch generally does not attempt to address other coding style
issues in the expressions changed (for example, missing spaces before
'(', or lack of parentheses to ensure indentation of continuation
lines properly reflects operator precedence).
Tested for x86_64, and with build-many-glibcs.py.
* benchtests/bench-memmem.c (simple_memmem): Break lines before
rather than after operators.
* benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise.
* crypt/md5.c (md5_finish_ctx): Likewise.
* crypt/sha256.c (__sha256_finish_ctx): Likewise.
* crypt/sha512.c (__sha512_finish_ctx): Likewise.
* elf/cache.c (load_aux_cache): Likewise.
* elf/dl-load.c (open_verify): Likewise.
* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
* elf/readelflib.c (process_elf_file): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
* hurd/ctty-input.c (_hurd_ctty_input): Likewise.
* hurd/ctty-output.c (_hurd_ctty_output): Likewise.
* hurd/dtable.c (reauth_dtable): Likewise.
* hurd/getdport.c (__getdport): Likewise.
* hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise.
* hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise.
* hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise):
Likewise.
* hurd/hurdioctl.c (fioctl): Likewise.
* hurd/hurdselect.c (_hurd_select): Likewise.
* hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise.
(STOPSIGS): Likewise.
* hurd/hurdstartup.c (_hurd_startup): Likewise.
* hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise.
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise.
* hurd/msgportdemux.c (msgport_server): Likewise.
* hurd/setauth.c (_hurd_setauth): Likewise.
* include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise.
* libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise.
* locale/programs/ld-ctype.c (set_class_defaults): Likewise.
* localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise.
* login/tst-utmp.c (do_check): Likewise.
(simulate_login): Likewise.
* mach/lowlevellock.h (lll_lock): Likewise.
(lll_trylock): Likewise.
* math/test-fenv.c (ALL_EXC): Likewise.
* math/test-fenvinline.c (ALL_EXC): Likewise.
* misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise.
* nis/nis_call.c (__do_niscall3): Likewise.
* nis/nis_callback.c (cb_prog_1): Likewise.
* nis/nis_defaults.c (searchaccess): Likewise.
* nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise.
* nis/nis_ismember.c (internal_ismember): Likewise.
* nis/nis_local_names.c (nis_local_principal): Likewise.
* nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise.
* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Likewise.
* nis/ypclnt.c (yp_match): Likewise.
(yp_first): Likewise.
(yp_next): Likewise.
(yp_master): Likewise.
(yp_order): Likewise.
* nscd/hstcache.c (cache_addhst): Likewise.
* nscd/initgrcache.c (addinitgroupsX): Likewise.
* nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise.
(internal_getpwuid_r): Likewise.
* nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise.
* posix/glob.h (__GLOB_FLAGS): Likewise.
* posix/regcomp.c (peek_token): Likewise.
(peek_token_bracket): Likewise.
(parse_expression): Likewise.
* posix/regexec.c (sift_states_iter_mb): Likewise.
(check_node_accept_bytes): Likewise.
* posix/tst-spawn3.c (do_test): Likewise.
* posix/wordexp-test.c (testit): Likewise.
* posix/wordexp.c (parse_tilde): Likewise.
(exec_comm): Likewise.
* posix/wordexp.h (__WRDE_FLAGS): Likewise.
* resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise.
* setjmp/sigjmp.c (__sigjmp_save): Likewise.
* stdio-common/printf_fp.c (__printf_fp_l): Likewise.
* stdio-common/tst-fileno.c (do_test): Likewise.
* stdio-common/vfprintf-internal.c (vfprintf): Likewise.
* stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise.
* stdlib/strtod_l.c (round_and_return): Likewise.
(____STRTOF_INTERNAL): Likewise.
* stdlib/tst-strfrom.h (TEST_STRFROM): Likewise.
* string/strcspn.c (STRCSPN): Likewise.
* string/test-memmem.c (simple_memmem): Likewise.
* termios/tcsetattr.c (tcsetattr): Likewise.
* time/alt_digit.c (_nl_parse_alt_digit): Likewise.
* time/asctime.c (asctime_internal): Likewise.
* time/strptime_l.c (__strptime_internal): Likewise.
* time/sys/time.h (timercmp): Likewise.
* time/tzfile.c (__tzfile_compute): Likewise.
2019-02-22 01:32:36 +00:00
|
|
|
((tv.tv_sec * VTIMES_UNITS_PER_SECOND) \
|
|
|
|
+ (tv.tv_usec * VTIMES_UNITS_PER_SECOND / 1000000))
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
/* If VT is not NULL, write statistics for WHO into *VT.
|
|
|
|
Return 0 for success, -1 for failure. */
|
|
|
|
static int
|
1997-05-29 12:06:58 +00:00
|
|
|
vtimes_one (struct vtimes *vt, enum __rusage_who who)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
|
|
|
if (vt != NULL)
|
|
|
|
{
|
|
|
|
struct rusage usage;
|
|
|
|
|
1998-07-16 11:44:36 +00:00
|
|
|
if (__getrusage (who, &usage) < 0)
|
1995-02-18 01:27:10 +00:00
|
|
|
return -1;
|
|
|
|
|
1997-08-02 21:00:51 +00:00
|
|
|
vt->vm_utime = TIMEVAL_TO_VTIMES (usage.ru_utime);
|
|
|
|
vt->vm_stime = TIMEVAL_TO_VTIMES (usage.ru_stime);
|
1995-02-18 01:27:10 +00:00
|
|
|
vt->vm_idsrss = usage.ru_idrss + usage.ru_isrss;
|
|
|
|
vt->vm_majflt = usage.ru_majflt;
|
|
|
|
vt->vm_minflt = usage.ru_minflt;
|
|
|
|
vt->vm_nswap = usage.ru_nswap;
|
|
|
|
vt->vm_inblk = usage.ru_inblock;
|
|
|
|
vt->vm_oublk = usage.ru_oublock;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If CURRENT is not NULL, write statistics for the current process into
|
|
|
|
*CURRENT. If CHILD is not NULL, write statistics for all terminated child
|
|
|
|
processes into *CHILD. Returns 0 for success, -1 for failure. */
|
|
|
|
int
|
2020-10-16 17:51:40 +00:00
|
|
|
__vtimes (struct vtimes *current, struct vtimes *child)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1997-08-02 21:00:51 +00:00
|
|
|
if (vtimes_one (current, RUSAGE_SELF) < 0
|
|
|
|
|| vtimes_one (child, RUSAGE_CHILDREN) < 0)
|
1995-02-18 01:27:10 +00:00
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
2020-10-16 17:51:40 +00:00
|
|
|
compat_symbol (libc, __vtimes, vtimes, GLIBC_2_0);
|
|
|
|
|
|
|
|
#endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_33) */
|