From b06f85d62c41a4ed108628b1c564203f36c0ab4e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Sep 2016 10:29:12 +0200 Subject: test: sync tst-atfork2 with GNU libc --- test/nptl/Makefile.in | 8 +-- test/nptl/libatfork.c | 27 -------- test/nptl/tst-atfork2.c | 158 +++++++++++++++++++++++++++++++++++++++++---- test/nptl/tst-atfork2mod.c | 57 ++++++++++++++++ 4 files changed, 206 insertions(+), 44 deletions(-) delete mode 100644 test/nptl/libatfork.c create mode 100644 test/nptl/tst-atfork2mod.c diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index f8dd1ca..f5d76da 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -152,8 +152,8 @@ CFLAGS_tst-initializers1-gnu99 = $(CFLAGS-tst-initializers1) -std=gnu99 EXTRA_LDFLAGS = $(if $(findstring -lpthread,$(LDFLAGS_$@)),,-lpthread) -LDFLAGS_tst-atfork2 := -ldl -LDFLAGS_libatfork.so := -shared -static-libgcc -lpthread +LDFLAGS_tst-atfork2 := -ldl -rdynamic +LDFLAGS_tst-atfork2mod.so := -shared -static-libgcc -lpthread LDFLAGS_tst-cleanup4 := tst-cleanup4aux.o LDFLAGS_tst-cleanupx4 := tst-cleanup4aux.o LDFLAGS_tst-clock2 := -lrt @@ -210,8 +210,8 @@ tst-tls5: tst-tls5mod.so tst-cleanupx4 : tst-cleanup4aux.o tst-fini1: tst-fini1mod.so -tst-atfork2: libatfork.so -tst-atfork2_glibc: libatfork.so.glibc +tst-atfork2: tst-atfork2mod.so +tst-atfork2_glibc: tst-atfork2mod.so.glibc OPTS_tst-cancel7 = -c ./tst-cancel7 OPTS_tst-mqueue7 = -- ./tst-mqueue7 diff --git a/test/nptl/libatfork.c b/test/nptl/libatfork.c deleted file mode 100644 index f4ddca0..0000000 --- a/test/nptl/libatfork.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include - -static void atfork_prepare(void) -{ - /* nothing to do */ -} - -static void atfork_parent(void) -{ - /* nothing to do */ -} - -static void atfork_child(void) -{ - /* nothing to do */ -} - -static __attribute__((constructor)) void init(void) -{ - pthread_atfork(atfork_prepare, atfork_parent, atfork_child); -} - -static __attribute__((destructor)) void done(void) -{ - /* nothing to do */ -} diff --git a/test/nptl/tst-atfork2.c b/test/nptl/tst-atfork2.c index 1c303de..594f56e 100644 --- a/test/nptl/tst-atfork2.c +++ b/test/nptl/tst-atfork2.c @@ -1,24 +1,156 @@ +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + 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 #include -#include +#include + -int main(int argc, char *argv[]) +/* Must be exported. */ +int val; + +static void +prepare (void) { - void *h; - pid_t pid; + val *= 2; +} - h = dlopen("libatfork.so", RTLD_NOW); - if (!h) +static void +parent (void) +{ + val += 4; +} + +static void +child (void) +{ + val += 8; +} + + +static int +do_test (void) +{ + + if (pthread_atfork (prepare, parent, child) != 0) { - printf("Failed to open libatfork.so\n"); - return 1; + puts ("do_test: atfork failed"); + exit (1); } - dlclose(h); - if ((pid = fork()) < 0) { - printf("Fork failed\n"); - return 1; + void *h = dlopen ("tst-atfork2mod.so", RTLD_LAZY); + if (h == NULL) + { + printf ("dlopen failed: %s\n", dlerror ()); + exit (1); } - return 0; + /* First trial of fork. */ + pid_t pid = fork (); + if (pid == -1) + { + puts ("1st fork failed"); + exit (1); + } + + if (pid == 0) + { + /* Child. */ + if (val != 80) + { + printf ("1st: expected val=%d, got %d\n", 80, val); + exit (2); + } + + exit (0); + } + + /* Parent. */ + if (val != 24) + { + printf ("1st: expected val=%d, got %d\n", 24, val); + exit (1); + } + + int status; + if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid) + { + puts ("1st waitpid failed"); + exit (1); + } + + if (status != 0) + exit (status); + + puts ("unloading now"); + + /* Unload the module. */ + if (dlclose (h) != 0) + { + puts ("dlclose failed"); + exit (1); + } + + puts ("2nd fork"); + + /* Second fork trial. */ + val = 1; + pid = fork (); + if (pid == -1) + { + puts ("2nd fork failed"); + exit (1); + } + + if (pid == 0) + { + /* Child. */ + if (val != 10) + { + printf ("2nd: expected val=%d, got %d\n", 10, val); + exit (3); + } + + exit (0); + } + + /* Parent. */ + if (val != 6) + { + printf ("2nd: expected val=%d, got %d\n", 6, val); + exit (1); + } + + if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid) + { + puts ("2nd waitpid failed"); + exit (1); + } + + if (status != 0) + exit (status); + + return 0; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/test/nptl/tst-atfork2mod.c b/test/nptl/tst-atfork2mod.c new file mode 100644 index 0000000..7c592b4 --- /dev/null +++ b/test/nptl/tst-atfork2mod.c @@ -0,0 +1,57 @@ +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + 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 + + +extern int val; + + +static void +prepare (void) +{ + ++val; +} + +static void +parent (void) +{ + val *= 4; +} + +static void +child (void) +{ + val *= 8; +} + +static void +__attribute__ ((constructor)) +init (void) +{ + extern void *__dso_handle; + printf ("dsohandle = %p\n", __dso_handle); + + if (pthread_atfork (prepare, parent, child) != 0) + { + puts ("init: atfork failed"); + exit (1); + } +} -- cgit v0.11.2-3-g2eb4