From: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
To: Vitaly Buka <vitalybuka@google.com>, libc-alpha@sourceware.org
Cc: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Subject: Re: [PATCH] stdlib: Undo post review change to 16adc58e73f3 [BZ #27749]
Date: Mon, 13 Feb 2023 13:27:02 -0300 [thread overview]
Message-ID: <92772e3f-4809-ed81-5d3a-796a7dce4f45@linaro.org> (raw)
In-Reply-To: <20230213060117.3193783-1-vitalybuka@google.com>
On 13/02/23 03:01, Vitaly Buka wrote:
> Post review removal of "goto restart" from
> https://sourceware.org/pipermail/libc-alpha/2021-April/125470.html
> introduced a bug when some atexit handers skipped.
>
> Signed-off-by: Vitaly Buka <vitalybuka@google.com>
Some minor issues on testcase style, besides that LGTM. I am trying to
recall why I have pushed a slight different patch than the one you posted
on maillist (most likely my mistake).
> ---
> stdlib/Makefile | 1 +
> stdlib/exit.c | 7 +++-
> stdlib/test-atexit-recursive.c | 72 ++++++++++++++++++++++++++++++++++
> 3 files changed, 78 insertions(+), 2 deletions(-)
> create mode 100644 stdlib/test-atexit-recursive.c
>
> diff --git a/stdlib/Makefile b/stdlib/Makefile
> index 83391d00c1..8f80571d76 100644
> --- a/stdlib/Makefile
> +++ b/stdlib/Makefile
> @@ -171,6 +171,7 @@ tests := \
> test-a64l \
> test-at_quick_exit-race \
> test-atexit-race \
> + test-atexit-recursive \
> test-bz22786 \
> test-canon \
> test-canon2 \
> diff --git a/stdlib/exit.c b/stdlib/exit.c
> index 6b1eed6445..1cd0bdfe94 100644
> --- a/stdlib/exit.c
> +++ b/stdlib/exit.c
> @@ -51,7 +51,10 @@ __run_exit_handlers (int status, struct exit_function_list **listp,
> exit (). */
> while (true)
> {
> - struct exit_function_list *cur = *listp;
> + struct exit_function_list *cur;
> +
> + restart:
> + cur = *listp;
>
> if (cur == NULL)
> {
> @@ -113,7 +116,7 @@ __run_exit_handlers (int status, struct exit_function_list **listp,
> if (__glibc_unlikely (new_exitfn_called != __new_exitfn_called))
> /* The last exit function, or another thread, has registered
> more exit functions. Start the loop over. */
> - continue;
> + goto restart;
> }
>
> *listp = cur->next;
> diff --git a/stdlib/test-atexit-recursive.c b/stdlib/test-atexit-recursive.c
> new file mode 100644
> index 0000000000..ca832941fe
> --- /dev/null
> +++ b/stdlib/test-atexit-recursive.c
> @@ -0,0 +1,72 @@
> +/* Support file for atexit/exit, etc. race tests (BZ #27749).
> + Copyright (C) 2021-2023 Free Software Foundation, Inc.
Just 2023 here.
> + 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/>. */
> +
> +/* Check that atexit handler registed from another handler still called. */
> +
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <support/check.h>
> +#include <support/xunistd.h>
> +#include <sys/wait.h>
> +#include <unistd.h>
> +
> +static void
> +atexit_cb (void) {
> +}
> +
Open brackets in new line:
func (void)
{
> +static void
> +atexit_last (void) {
> + _exit (1);
> +}
> +
> +static void
> +atexit_recursive (void) {
> + atexit(&atexit_cb);
Space after function name.
> + atexit(&atexit_last);
> +}
> +
> +_Noreturn static void
> +test_and_exit (int count)
> +{
> + for (int i = 0; i < count; ++i)
> + atexit(&atexit_cb);
> + atexit(&atexit_recursive);
> + exit (0);
> +}
> +
> +static int
> +do_test (void)
> +{
> + for (int i = 0; i < 100; ++i)
> + if (xfork () == 0)
> + test_and_exit (i);
> +
> + for (int i = 0; i < 100; ++i)
> + {
> + int status;
> + xwaitpid (0, &status, 0);
> + if (!WIFEXITED (status))
> + FAIL_EXIT1 ("Failed iterations %d", i);
> + TEST_COMPARE (WEXITSTATUS (status), 1);
> + }
> +
> + return 0;
> +}
> +
> +#define TEST_FUNCTION do_test
No need to define TEST_FUNCTION.
> +#include <support/test-driver.c>
next prev parent reply other threads:[~2023-02-13 16:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-12 23:43 commit 16adc58e73f3 (stdlib: Fix data race in __run_exit_handlers [BZ #27749]) Rasmus Villemoes
2023-02-13 1:54 ` Vitaly Buka
2023-02-13 5:57 ` [PATCH] stdlib: Undo post review change to 16adc58e73f3 [BZ #27749] Vitaly Buka
2023-02-13 6:01 ` Vitaly Buka
2023-02-13 16:27 ` Adhemerval Zanella Netto [this message]
2023-02-18 20:53 ` Vitaly Buka
2023-02-20 12:20 ` Adhemerval Zanella Netto
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=92772e3f-4809-ed81-5d3a-796a7dce4f45@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
--cc=rasmus.villemoes@prevas.dk \
--cc=vitalybuka@google.com \
/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).