diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 9 | ||||
| -rw-r--r-- | nptl/tst-align2.c | 95 | ||||
| -rw-r--r-- | nptl/tst-getpid1.c | 122 | ||||
| -rw-r--r-- | nptl/tst-getpid2.c | 2 |
4 files changed, 2 insertions, 226 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 43d85103f8..6ae76bb8d1 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -229,7 +229,7 @@ tests = tst-typesizes \ tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ tst-sem8 tst-sem9 tst-sem10 tst-sem11 tst-sem12 tst-sem13 tst-sem14 \ tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \ - tst-align tst-align2 tst-align3 \ + tst-align tst-align3 \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ tst-basic7 \ tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \ @@ -269,7 +269,7 @@ tests = tst-typesizes \ tst-backtrace1 \ tst-abstime \ tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \ - tst-getpid1 tst-getpid2 tst-getpid3 \ + tst-getpid3 \ tst-setuid3 \ tst-initializers1 $(addprefix tst-initializers1-,c89 gnu89 c99 gnu99) \ tst-bad-schedattr @@ -463,11 +463,6 @@ tst-cancel7-ARGS = --command "exec $(host-test-program-cmd)" tst-cancelx7-ARGS = $(tst-cancel7-ARGS) tst-umask1-ARGS = $(objpfx)tst-umask1.temp -# In this test, we create a CLONE_VM "thread" that shares TLS storage -# with the original thread. Both threads then race in ld.so with lazy PLT -# resolution. Avoid this race by disabling lazy binding. BZ #11214. -tst-getpid2-ENV = LD_BIND_NOW=1 - $(objpfx)tst-atfork2: $(libdl) $(shared-thread-library) LDFLAGS-tst-atfork2 = -rdynamic tst-atfork2-ENV = MALLOC_TRACE=$(objpfx)tst-atfork2.mtrace diff --git a/nptl/tst-align2.c b/nptl/tst-align2.c deleted file mode 100644 index 626f605d21..0000000000 --- a/nptl/tst-align2.c +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright (C) 2004-2015 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 - <http://www.gnu.org/licenses/>. */ - -#include <sched.h> -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> -#include <string.h> -#include <sys/wait.h> -#include <unistd.h> -#include <tst-stack-align.h> -#include <stackinfo.h> - -static int -f (void *arg) -{ - bool ok = true; - - puts ("in f"); - - if (TEST_STACK_ALIGN ()) - ok = false; - - return ok ? 0 : 1; -} - -static int -do_test (void) -{ - bool ok = true; - - puts ("in main"); - - if (TEST_STACK_ALIGN ()) - ok = false; - -#ifdef __ia64__ - extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, - size_t __child_stack_size, int __flags, - void *__arg, ...); - char st[256 * 1024]; - pid_t p = __clone2 (f, st, sizeof (st), 0, 0); -#else - char st[128 * 1024] __attribute__ ((aligned)); -# if _STACK_GROWS_DOWN - pid_t p = clone (f, st + sizeof (st), 0, 0); -# elif _STACK_GROWS_UP - pid_t p = clone (f, st, 0, 0); -# else -# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -# endif -#endif - if (p == -1) - { - printf("clone failed: %m\n"); - return 1; - } - - int e; - if (waitpid (p, &e, __WCLONE) != p) - { - puts ("waitpid failed"); - kill (p, SIGKILL); - return 1; - } - if (!WIFEXITED (e)) - { - if (WIFSIGNALED (e)) - printf ("died from signal %s\n", strsignal (WTERMSIG (e))); - else - puts ("did not terminate correctly"); - return 1; - } - if (WEXITSTATUS (e) != 0) - ok = false; - - return ok ? 0 : 1; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" diff --git a/nptl/tst-getpid1.c b/nptl/tst-getpid1.c deleted file mode 100644 index 253ebf2e15..0000000000 --- a/nptl/tst-getpid1.c +++ /dev/null @@ -1,122 +0,0 @@ -#include <sched.h> -#include <signal.h> -#include <string.h> -#include <stdio.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/wait.h> -#include <stackinfo.h> - -#ifndef TEST_CLONE_FLAGS -#define TEST_CLONE_FLAGS 0 -#endif - -static int sig; - -static int -f (void *a) -{ - puts ("in f"); - union sigval sival; - sival.sival_int = getpid (); - printf ("pid = %d\n", sival.sival_int); - if (sigqueue (getppid (), sig, sival) != 0) - return 1; - return 0; -} - - -static int -do_test (void) -{ - int mypid = getpid (); - - sig = SIGRTMIN; - sigset_t ss; - sigemptyset (&ss); - sigaddset (&ss, sig); - if (sigprocmask (SIG_BLOCK, &ss, NULL) != 0) - { - printf ("sigprocmask failed: %m\n"); - return 1; - } - -#ifdef __ia64__ - extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, - size_t __child_stack_size, int __flags, - void *__arg, ...); - char st[256 * 1024] __attribute__ ((aligned)); - pid_t p = __clone2 (f, st, sizeof (st), TEST_CLONE_FLAGS, 0); -#else - char st[128 * 1024] __attribute__ ((aligned)); -# if _STACK_GROWS_DOWN - pid_t p = clone (f, st + sizeof (st), TEST_CLONE_FLAGS, 0); -# elif _STACK_GROWS_UP - pid_t p = clone (f, st, TEST_CLONE_FLAGS, 0); -# else -# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -# endif -#endif - if (p == -1) - { - printf("clone failed: %m\n"); - return 1; - } - printf ("new thread: %d\n", (int) p); - - siginfo_t si; - do - if (sigwaitinfo (&ss, &si) < 0) - { - printf("sigwaitinfo failed: %m\n"); - kill (p, SIGKILL); - return 1; - } - while (si.si_signo != sig || si.si_code != SI_QUEUE); - - int e; - if (waitpid (p, &e, __WCLONE) != p) - { - puts ("waitpid failed"); - kill (p, SIGKILL); - return 1; - } - if (!WIFEXITED (e)) - { - if (WIFSIGNALED (e)) - printf ("died from signal %s\n", strsignal (WTERMSIG (e))); - else - puts ("did not terminate correctly"); - return 1; - } - if (WEXITSTATUS (e) != 0) - { - printf ("exit code %d\n", WEXITSTATUS (e)); - return 1; - } - - if (si.si_int != (int) p) - { - printf ("expected PID %d, got si_int %d\n", (int) p, si.si_int); - kill (p, SIGKILL); - return 1; - } - - if (si.si_pid != p) - { - printf ("expected PID %d, got si_pid %d\n", (int) p, (int) si.si_pid); - kill (p, SIGKILL); - return 1; - } - - if (getpid () != mypid) - { - puts ("my PID changed"); - return 1; - } - - return 0; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" diff --git a/nptl/tst-getpid2.c b/nptl/tst-getpid2.c deleted file mode 100644 index fc98cb60db..0000000000 --- a/nptl/tst-getpid2.c +++ /dev/null @@ -1,2 +0,0 @@ -#define TEST_CLONE_FLAGS CLONE_VM -#include "tst-getpid1.c" |