From patchwork Mon Jul 24 15:50:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 21743 Received: (qmail 822 invoked by alias); 24 Jul 2017 15:50:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 130625 invoked by uid 89); 24 Jul 2017 15:50:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: mail-ua0-f173.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=p4YYzcUbo9IgZzeBwzCPc2wBRDXuJiK3LsQSjI5iEBs=; b=R3rXtZAtOcBNdUG0QuYtLhFUMbMCSAbZW7OUzVt4GJpSK6/lKL9mchxnL+c8jbjhnc ijIa6NcWoJpMfCx6FZIM13kPfeztDnjFn1SR005kdpds91hXtzuTa7qJB6ATjVxvl13z M5g4DtbHmrAMyUlCXdBruYvE5rkSqbsx+P18uFWnvLeuXeY4+ntwe7wCB9kprAXxjvi3 fdhUAQajob0CNBIAzJXc/qa4HFpofy/liFUqVENLwTbS6c1DNfCPBs6vqFgPV0gf2Rof 0M6ayILV06Hf4C4t9m8E02A3mz9RwYz9ixig4ObMyOlFbGhOcx1wls5KBmriAVuI0am1 Ecfg== X-Gm-Message-State: AIVw112TuCtO9MjS/3hv1c4Fy2+j/8LuLuhdmNAKjkVjkX5MZqJAsy9y wzYEMPXedeqpV5kfn+38a4L1vJkjC39G X-Received: by 10.176.27.160 with SMTP id k32mr10152480uai.200.1500911448375; Mon, 24 Jul 2017 08:50:48 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <5963A105.4070308@arm.com> From: Paul Pluzhnikov Date: Mon, 24 Jul 2017 08:50:17 -0700 Message-ID: Subject: Re: [patch] Add tests for atexit/on_exit firing order To: Joseph Myers Cc: Szabolcs Nagy , nd@arm.com, GLIBC Devel On Mon, Jul 24, 2017 at 8:44 AM, Paul Pluzhnikov wrote: > On Mon, Jul 10, 2017 at 8:56 AM, Joseph Myers wrote: >> On Mon, 10 Jul 2017, Szabolcs Nagy wrote: >> >>> you could call __cxa_atexit and __cxa_at_quick_exit >> >> Well, those should properly have such tests as well. > > > Revised patch attached. Thanks. I forgot to test the case where fn_final doesn't fire at all. Revised (only last line of do_test changed). 2017-07-24 Paul Pluzhnikov * stdlib/Makefile (tst-atexit, tst-at_quick_exit): New tests (tst-cxa_atexit, tst-on_exit): Likewise * stdlib/tst-atexit-common.c: New. * stdlib/tst-atexit.c: New. * stdlib/tst-at_quick_exit.c: New. * stdlib/tst-cxa_atexit.c: New. diff --git a/stdlib/Makefile b/stdlib/Makefile index 0314d5926b..94cbd0e479 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -80,7 +80,9 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ tst-strtol-locale tst-strtod-nan-locale tst-strfmon_l \ tst-quick_exit tst-thread-quick_exit tst-width \ tst-width-stdint tst-strfrom tst-strfrom-locale \ - tst-getrandom + tst-getrandom tst-atexit tst-at_quick_exit \ + tst-cxa_atexit tst-on_exit + tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete tests-static := tst-secure-getenv diff --git a/stdlib/tst-at_quick_exit.c b/stdlib/tst-at_quick_exit.c new file mode 100644 index 0000000000..c86bbe3455 --- /dev/null +++ b/stdlib/tst-at_quick_exit.c @@ -0,0 +1,25 @@ +/* Test that functions registered via at_auick_exit are called in correct + (LIFO) order. In particular, exit handlers can themselves register + additional handlers, so we test that. + + Copyright (C) 2017 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 + . */ + +#define ATEXIT(fn) at_quick_exit (fn) +#define EXIT(x) quick_exit (x) + +#include diff --git a/stdlib/tst-atexit-common.c b/stdlib/tst-atexit-common.c new file mode 100644 index 0000000000..428dba1742 --- /dev/null +++ b/stdlib/tst-atexit-common.c @@ -0,0 +1,86 @@ +/* Helper file for tst-{atexit,at_quick_exit,cxa_atexit,on_exit}. + + Copyright (C) 2017 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 + . */ + +#include +#include +#include +#include +#include + +#define MAX_ATEXIT 20 +static char crumbs[MAX_ATEXIT]; +static int next_slot = 0; + +static void +fn0 (void) +{ + crumbs[next_slot++] = '0'; +} + +static void +fn1 (void) +{ + crumbs[next_slot++] = '1'; +} + +static void +fn2 (void) +{ + crumbs[next_slot++] = '2'; + ATEXIT (fn1); +} + +static void +fn3 (void) +{ + crumbs[next_slot++] = '3'; + ATEXIT (fn2); + ATEXIT (fn0); +} + +static void +fn_final (void) +{ + const char expected[] = "3021121130211"; + if (strcmp (crumbs, expected) == 0) + _exit (0); + + printf ("crumbs: %s\n", crumbs); + printf ("expected: %s\n", expected); + _exit (1); +} + +static int +do_test (void) +{ + /* Register this first so it can verify expected order of the rest. */ + ATEXIT (fn_final); + + ATEXIT (fn1); + ATEXIT (fn3); + ATEXIT (fn1); + ATEXIT (fn2); + ATEXIT (fn1); + ATEXIT (fn3); + + EXIT (2); /* If we see this exit code, fn_final must have not worked. */ +} + +#define TEST_FUNCTION do_test +#include diff --git a/stdlib/tst-atexit.c b/stdlib/tst-atexit.c new file mode 100644 index 0000000000..8ca401bcbf --- /dev/null +++ b/stdlib/tst-atexit.c @@ -0,0 +1,25 @@ +/* Test that functions registered via atexit are called in correct + (LIFO) order. In particular, exit handlers can themselves register + additional handlers, so we test that. + + Copyright (C) 2017 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 + . */ + +#define ATEXIT(fn) atexit (fn) +#define EXIT(x) exit (x) + +#include diff --git a/stdlib/tst-cxa_atexit.c b/stdlib/tst-cxa_atexit.c new file mode 100644 index 0000000000..46fa04a1f7 --- /dev/null +++ b/stdlib/tst-cxa_atexit.c @@ -0,0 +1,27 @@ +/* Test that functions registered via __cxa_atexit are called in correct + (LIFO) order. In particular, exit handlers can themselves register + additional handlers, so we test that. + + Copyright (C) 2017 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 + . */ + +extern int __cxa_atexit (void (*func) (void *), void *arg, void *d); + +#define ATEXIT(fn) __cxa_atexit ((void (*) (void *)) fn, (void *) 0, (void *) 0) +#define EXIT(x) exit (x) + +#include diff --git a/stdlib/tst-on_exit.c b/stdlib/tst-on_exit.c new file mode 100644 index 0000000000..8dda872154 --- /dev/null +++ b/stdlib/tst-on_exit.c @@ -0,0 +1,25 @@ +/* Test that functions registered via on_exit are called in correct + (LIFO) order. In particular, exit handlers can themselves register + additional handlers, so we test that. + + Copyright (C) 2017 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 + . */ + +#define ATEXIT(fn) on_exit ((void (*) (int, void *)) fn, (void *) 0) +#define EXIT(x) exit (x) + +#include