From patchwork Wed Jul 25 12:14:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 28604 Received: (qmail 128566 invoked by alias); 25 Jul 2018 12:14:26 -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 128553 invoked by uid 89); 25 Jul 2018 12:14:25 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pg1-f170.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=bgWVhFrOeZ7LED+zzwVsGBgn1WNyGfEjktHaDTwPHsE=; b=JyWzV8Cc7CXcT5Ne2hZv5tYY/NnjaOarxhjwj/jCXWMuTLV3P3M4YGMTPC6Lwyu8AZ VzD00lDQ2TsFenD0yw6Nb/3etbl4utWfdKP7gX0OuG8TZGj+LFZfeyTK2HB8+7V9WZxP BeksCdUECfyxFgGX08hO9lbcgxwuKTJpWEElThm3qSscT91cADXjGP8at+15QnBky5Wt +GUqzcZOEInP/FQDaybXp3FJCF92Hl6nnNrEMDDGK5nKpZsEILUGFYNMY2bjOI6g2yqV X/DZDNAxd95CDZ3S5m0m+jcgEojvMnQ6vH9y8L4M/JVgtAuwmAeAa36IakpJIs0eMfks bgEw== Return-Path: Date: Wed, 25 Jul 2018 05:14:19 -0700 From: "H.J. Lu" To: Carlos O'Donell Cc: libc-alpha@sourceware.org Subject: Re: [PATCH 12/12] Add tests for setcontext on the context from makecontext Message-ID: <20180725121419.GC13278@gmail.com> References: <20180721142035.21059-1-hjl.tools@gmail.com> <20180721142035.21059-13-hjl.tools@gmail.com> <5a35a0bc-e164-ff3b-6c37-036250b2d20d@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5a35a0bc-e164-ff3b-6c37-036250b2d20d@redhat.com> User-Agent: Mutt/1.10.0 (2018-05-17) On Tue, Jul 24, 2018 at 11:51:16PM -0400, Carlos O'Donell wrote: > On 07/21/2018 10:20 AM, H.J. Lu wrote: > > * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, > > tst-setcontext8 and tst-setcontext9. > > * stdlib/tst-setcontext6.c: New file. > > * stdlib/tst-setcontext7.c: Likewise. > > * stdlib/tst-setcontext8.c: Likewise. > > * stdlib/tst-setcontext9.c: Likewise. > > OK for 2.28 if you use atomics instead of volatile int. > > Reviewed-by: Carlos O'Donell This is what I checked in. H.J. --- From 375a484459efcf2da1100e9ed228863be6665986 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 25 Jul 2018 05:12:59 -0700 Subject: [PATCH] Add tests for setcontext on the context from makecontext Reviewed-by: Carlos O'Donell * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, tst-setcontext8 and tst-setcontext9. * stdlib/tst-setcontext6.c: New file. * stdlib/tst-setcontext7.c: Likewise. * stdlib/tst-setcontext8.c: Likewise. * stdlib/tst-setcontext9.c: Likewise. --- ChangeLog | 9 ++++ stdlib/Makefile | 4 +- stdlib/tst-setcontext6.c | 77 +++++++++++++++++++++++++++++ stdlib/tst-setcontext7.c | 97 +++++++++++++++++++++++++++++++++++++ stdlib/tst-setcontext8.c | 82 +++++++++++++++++++++++++++++++ stdlib/tst-setcontext9.c | 101 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 369 insertions(+), 1 deletion(-) create mode 100644 stdlib/tst-setcontext6.c create mode 100644 stdlib/tst-setcontext7.c create mode 100644 stdlib/tst-setcontext8.c create mode 100644 stdlib/tst-setcontext9.c diff --git a/ChangeLog b/ChangeLog index 6935bc3b09..24396a0573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-07-25 H.J. Lu + + * stdlib/Makefile ((tests): Add tst-setcontext6, tst-setcontext7, + tst-setcontext8 and tst-setcontext9. + * stdlib/tst-setcontext6.c: New file. + * stdlib/tst-setcontext7.c: Likewise. + * stdlib/tst-setcontext8.c: Likewise. + * stdlib/tst-setcontext9.c: Likewise. + 2018-07-25 H.J. Lu * stdlib/Makefile ((tests): Add tst-setcontext5. diff --git a/stdlib/Makefile b/stdlib/Makefile index 403ca22f49..01194bbf7c 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -85,7 +85,9 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ test-at_quick_exit-race test-cxa_atexit-race \ test-on_exit-race test-dlclose-exit-race \ tst-makecontext-align test-bz22786 tst-strtod-nan-sign \ - tst-swapcontext1 tst-setcontext4 tst-setcontext5 + tst-swapcontext1 tst-setcontext4 tst-setcontext5 \ + tst-setcontext6 tst-setcontext7 tst-setcontext8 \ + tst-setcontext9 tests-internal := tst-strtod1i tst-strtod3 tst-strtod4 tst-strtod5i \ tst-tls-atexit tst-tls-atexit-nodelete diff --git a/stdlib/tst-setcontext6.c b/stdlib/tst-setcontext6.c new file mode 100644 index 0000000000..e530154554 --- /dev/null +++ b/stdlib/tst-setcontext6.c @@ -0,0 +1,77 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 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 + +static ucontext_t ctx[3]; +static atomic_int done; + +static void +f1 (void) +{ + printf ("start f1\n"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + } + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include diff --git a/stdlib/tst-setcontext7.c b/stdlib/tst-setcontext7.c new file mode 100644 index 0000000000..053819f358 --- /dev/null +++ b/stdlib/tst-setcontext7.c @@ -0,0 +1,97 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 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 + +static ucontext_t ctx[5]; +static atomic_int done; + +static void +f1 (void) +{ + puts ("start f1"); + if (!done) + { + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + } + done++; + puts ("swap contexts in f1"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f1"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include diff --git a/stdlib/tst-setcontext8.c b/stdlib/tst-setcontext8.c new file mode 100644 index 0000000000..53fb2bc1dd --- /dev/null +++ b/stdlib/tst-setcontext8.c @@ -0,0 +1,82 @@ +/* Check getcontext and setcontext on the context from makecontext. + Copyright (C) 2018 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 + +static ucontext_t ctx[3]; +static atomic_int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + printf ("start f2\n"); + done++; + if (setcontext (&ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } +} + +static void +f1 (void) +{ + printf ("start f1\n"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + exit (EXIT_SUCCESS); + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + if (setcontext (&ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include diff --git a/stdlib/tst-setcontext9.c b/stdlib/tst-setcontext9.c new file mode 100644 index 0000000000..4636ce9030 --- /dev/null +++ b/stdlib/tst-setcontext9.c @@ -0,0 +1,101 @@ +/* Check setcontext on the context from makecontext. + Copyright (C) 2018 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 + +static ucontext_t ctx[5]; +static atomic_int done; + +static void +__attribute__((noinline, noclone)) +f2 (void) +{ + done++; + puts ("swap contexts in f2"); + if (swapcontext (&ctx[4], &ctx[2]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + puts ("end f2"); + exit (done == 2 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +static void +f1 (void) +{ + puts ("start f1"); + if (getcontext (&ctx[2]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done) + { + puts ("set context in f1"); + if (setcontext (&ctx[3]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + } + f2 (); +} + +static int +do_test (void) +{ + char st1[32768]; + puts ("making contexts"); + if (getcontext (&ctx[0]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (getcontext (&ctx[1]) != 0) + { + printf ("%s: getcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + ctx[1].uc_stack.ss_sp = st1; + ctx[1].uc_stack.ss_size = sizeof st1; + ctx[1].uc_link = &ctx[0]; + makecontext (&ctx[1], (void (*) (void)) f1, 0); + puts ("swap contexts"); + if (swapcontext (&ctx[3], &ctx[1]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + if (done != 1) + exit (EXIT_FAILURE); + done++; + puts ("set context"); + if (setcontext (&ctx[4]) != 0) + { + printf ("%s: setcontext: %m\n", __FUNCTION__); + exit (EXIT_FAILURE); + } + exit (EXIT_FAILURE); +} + +#include