From: Lukasz Majewski <lukma@denx.de>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org, Alistair Francis <alistair23@gmail.com>
Subject: Re: [PATCH 3/3] linux: Add 64-bit time_t support for wait3
Date: Fri, 16 Oct 2020 11:14:41 +0200 [thread overview]
Message-ID: <20201016111441.2676a9f8@jawa> (raw)
In-Reply-To: <20201015130632.90961-3-adhemerval.zanella@linaro.org>
[-- Attachment #1: Type: text/plain, Size: 3618 bytes --]
Hi Adhemerval,
> It basically calls the 64-bit time_t wait4 internal symbol.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu.
> ---
> include/sys/resource.h | 4 +++
> sysdeps/unix/sysv/linux/wait3.c | 44
> +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+)
> create mode 100644 sysdeps/unix/sysv/linux/wait3.c
>
> diff --git a/include/sys/resource.h b/include/sys/resource.h
> index 64925f257c..2235b020fc 100644
> --- a/include/sys/resource.h
> +++ b/include/sys/resource.h
> @@ -138,12 +138,16 @@ libc_hidden_proto (__setrlimit);
> #if __TIMESIZE == 64
> # define __getrusage64 __getrusage
> # define __wait4_time64 __wait4
> +# define __wait3_time64 __wait3
> #else
> extern int __getrusage64 (enum __rusage_who who, struct __rusage64
> *usage); libc_hidden_proto (__getrusage64)
> extern pid_t __wait4_time64 (pid_t pid, int *stat_loc, int options,
> struct __rusage64 *usage);
> libc_hidden_proto (__wait4_time64)
> +extern pid_t __wait3_time64 (int *stat_loc, int options,
> + struct __rusage64 *usage);
> +libc_hidden_proto (__wait3_time64)
> #endif
> #endif
> #endif
> diff --git a/sysdeps/unix/sysv/linux/wait3.c
> b/sysdeps/unix/sysv/linux/wait3.c new file mode 100644
> index 0000000000..c05776f7ab
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/wait3.c
> @@ -0,0 +1,44 @@
> +/* Wait for process to change state, BSD style. Linux version.
> + Copyright (C) 2020 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 <sys/wait.h>
> +#include <sys/resource.h>
> +#include <sys/types.h>
> +
> +pid_t
> +__wait3_time64 (int *stat_loc, int options, struct __rusage64 *usage)
> +{
> + return __wait4_time64 (WAIT_ANY, stat_loc, options, usage);
> +}
> +#if __TIMESIZE != 64
> +libc_hidden_def (__wait3_time64)
> +
> +pid_t
> +__wait3 (int *stat_loc, int options, struct rusage *usage)
> +{
> + struct __rusage64 usage64;
> + pid_t ret = __wait3_time64 (stat_loc, options,
> + usage != NULL ? &usage64 : NULL);
> + if (ret > 0 && usage != NULL)
> + rusage64_to_rusage (&usage64, usage);
> +
> + return ret;
> +}
> +#endif
> +
> +weak_alias (__wait3, wait3)
Thanks for converting this.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Side comment:
-------------
Now, I've just realized that struct __rusage64 (defined in non-exported
header: include/sys/resource.h) also needs to be exported for proper
Y2038 support (the same case as with struct __stat64_t64).
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-16 9:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 13:06 [PATCH 1/3] linux: Fix time64 support for futimesat Adhemerval Zanella
2020-10-15 13:06 ` [PATCH 2/3] Move ftime to a compatibility symbol Adhemerval Zanella
2020-10-16 9:05 ` Lukasz Majewski
2020-10-16 18:18 ` [COMMITTED] Add NEWS entry for ftime compatibility move Adhemerval Zanella
2020-10-19 7:55 ` [PATCH 2/3] Move ftime to a compatibility symbol Szabolcs Nagy
2020-10-19 8:17 ` Andreas Schwab
2020-10-19 8:30 ` Florian Weimer
2020-10-19 9:18 ` Tamar Christina
2020-10-19 9:51 ` Florian Weimer
2020-10-19 10:20 ` Tamar Christina
2020-10-19 10:46 ` Florian Weimer
2020-10-19 10:49 ` Florian Weimer
2020-10-19 11:56 ` Andreas Schwab
2020-10-19 11:58 ` Florian Weimer
2020-10-19 12:30 ` Adhemerval Zanella
2020-10-19 12:31 ` Adhemerval Zanella
2020-10-19 17:56 ` Joseph Myers
2020-10-15 13:06 ` [PATCH 3/3] linux: Add 64-bit time_t support for wait3 Adhemerval Zanella
2020-10-15 14:43 ` Alistair Francis
2020-10-16 9:14 ` Lukasz Majewski [this message]
2020-10-16 17:02 ` Adhemerval Zanella
2020-10-18 19:55 ` Lukasz Majewski
2020-10-16 8:41 ` [PATCH 1/3] linux: Fix time64 support for futimesat Lukasz Majewski
2020-10-16 14:20 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016111441.2676a9f8@jawa \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair23@gmail.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).