pthread: Move some join tests from nptl to sysdeps/pthread

So they can be checked with htl too.

13 files changed, 8 insertions, 521 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index a72022a052..6f210d60e3 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -253,7 +253,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-align tst-align3 \
 	tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
 	tst-raise1 \
-	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \
+	tst-join2 tst-join3 \
 	tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \
 	tst-join14 \
 	tst-detach1 \
@@ -385,7 +385,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
 		tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
 		tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \
 		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \
-		tst-join7mod tst-compat-forwarder-mod tst-audit-threads-mod1 \
+		tst-compat-forwarder-mod tst-audit-threads-mod1 \
 		tst-audit-threads-mod2
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \
 		   tst-cleanup4aux.o tst-cleanupx4aux.o
@@ -579,11 +579,6 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
 	$(evaluate-test)
 endif
 
-$(objpfx)tst-join7: $(libdl) $(shared-thread-library)
-$(objpfx)tst-join7.out: $(objpfx)tst-join7mod.so
-$(objpfx)tst-join7mod.so: $(shared-thread-library)
-LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so
-
 $(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library)
 
 $(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so
diff --git a/nptl/tst-join1.c b/nptl/tst-join1.c
deleted file mode 100644
index 05bf5e4faa..0000000000
--- a/nptl/tst-join1.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-   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/>.  */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-
-
-static void *
-tf (void *arg)
-{
-  pthread_t mh = (pthread_t) arg;
-  void *result;
-
-  if (pthread_mutex_unlock (&lock) != 0)
-    {
-      puts ("unlock failed");
-      exit (1);
-    }
-
-  if (pthread_join (mh, &result) != 0)
-    {
-      puts ("join failed");
-      exit (1);
-    }
-
-  if (result != (void *) 42l)
-    {
-      printf ("result wrong: expected %p, got %p\n", (void *) 42, result);
-      exit (1);
-    }
-
-  exit (0);
-}
-
-
-static int
-do_test (void)
-{
-  pthread_t th;
-
-  if (pthread_mutex_lock (&lock) != 0)
-    {
-      puts ("1st lock failed");
-      exit (1);
-    }
-
-  if (pthread_create (&th, NULL, tf, (void *) pthread_self ()) != 0)
-    {
-      puts ("create failed");
-      exit (1);
-    }
-
-  if (pthread_mutex_lock (&lock) != 0)
-    {
-      puts ("2nd lock failed");
-      exit (1);
-    }
-
-  pthread_exit ((void *) 42);
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/nptl/tst-join10.c b/nptl/tst-join10.c
index 2d1d14f45d..6e94c00f75 100644
--- a/nptl/tst-join10.c
+++ b/nptl/tst-join10.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join11.c b/nptl/tst-join11.c
index c03bd90403..ed8312bc6b 100644
--- a/nptl/tst-join11.c
+++ b/nptl/tst-join11.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join12.c b/nptl/tst-join12.c
index 10e45bf40c..57d713c82d 100644
--- a/nptl/tst-join12.c
+++ b/nptl/tst-join12.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join13.c b/nptl/tst-join13.c
index 640df5946b..61a9106ebf 100644
--- a/nptl/tst-join13.c
+++ b/nptl/tst-join13.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join4.c b/nptl/tst-join4.c
deleted file mode 100644
index 18af45aaf8..0000000000
--- a/nptl/tst-join4.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright (C) 2003-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-static pthread_barrier_t bar;
-
-
-static void *
-tf (void *arg)
-{
-  if (pthread_barrier_wait (&bar) != 0)
-    {
-      puts ("tf: barrier_wait failed");
-      exit (1);
-    }
-
-  return (void *) 1l;
-}
-
-
-static int
-do_test (void)
-{
-  if (pthread_barrier_init (&bar, NULL, 3) != 0)
-    {
-      puts ("barrier_init failed");
-      exit (1);
-    }
-
-  pthread_attr_t a;
-
-  if (pthread_attr_init (&a) != 0)
-    {
-      puts ("attr_init failed");
-      exit (1);
-    }
-
-  if (pthread_attr_setstacksize (&a, 1 * 1024 * 1024) != 0)
-    {
-      puts ("attr_setstacksize failed");
-      return 1;
-    }
-
-  pthread_t th[2];
-
-  if (pthread_create (&th[0], &a, tf, NULL) != 0)
-    {
-      puts ("1st create failed");
-      exit (1);
-    }
-
-  if (pthread_attr_setdetachstate (&a, PTHREAD_CREATE_DETACHED) != 0)
-    {
-      puts ("attr_setdetachstate failed");
-      exit (1);
-    }
-
-  if (pthread_create (&th[1], &a, tf, NULL) != 0)
-    {
-      puts ("1st create failed");
-      exit (1);
-    }
-
-  if (pthread_attr_destroy (&a) != 0)
-    {
-      puts ("attr_destroy failed");
-      exit (1);
-    }
-
-  if (pthread_detach (th[0]) != 0)
-    {
-      puts ("could not detach 1st thread");
-      exit (1);
-    }
-
-  int err = pthread_detach (th[0]);
-  if (err == 0)
-    {
-      puts ("second detach of 1st thread succeeded");
-      exit (1);
-    }
-  if (err != EINVAL)
-    {
-      printf ("second detach of 1st thread returned %d, not EINVAL\n", err);
-      exit (1);
-    }
-
-  err = pthread_detach (th[1]);
-  if (err == 0)
-    {
-      puts ("detach of 2nd thread succeeded");
-      exit (1);
-    }
-  if (err != EINVAL)
-    {
-      printf ("detach of 2nd thread returned %d, not EINVAL\n", err);
-      exit (1);
-    }
-
-  exit (0);
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/nptl/tst-join5.c b/nptl/tst-join5.c
deleted file mode 100644
index acdc365c05..0000000000
--- a/nptl/tst-join5.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright (C) 2003-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <support/check.h>
-#include <support/timespec.h>
-#include <support/xthread.h>
-#include <support/xtime.h>
-
-static void
-wait_code (void)
-{
-  struct timespec ts = { .tv_sec = 0, .tv_nsec = 200000000 };
-  while (nanosleep (&ts, &ts) < 0)
-    ;
-}
-
-
-#ifdef WAIT_IN_CHILD
-static pthread_barrier_t b;
-#endif
-
-static int
-thread_join (pthread_t thread, void **retval)
-{
-#if defined USE_PTHREAD_TIMEDJOIN_NP
-  const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
-                                           make_timespec (1000, 0));
-  return pthread_timedjoin_np (thread, retval, &ts);
-#elif defined USE_PTHREAD_CLOCKJOIN_NP_REALTIME
-  const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME),
-                                           make_timespec (1000, 0));
-  return pthread_clockjoin_np (thread, retval, CLOCK_REALTIME, &ts);
-#elif defined USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC
-  const struct timespec ts = timespec_add (xclock_now (CLOCK_MONOTONIC),
-                                           make_timespec (1000, 0));
-  return pthread_clockjoin_np (thread, retval, CLOCK_MONOTONIC, &ts);
-#else
-  return pthread_join (thread, retval);
-#endif
-}
-
-
-static void *
-tf1 (void *arg)
-{
-#ifdef WAIT_IN_CHILD
-  xpthread_barrier_wait (&b);
-
-  wait_code ();
-#endif
-
-  thread_join ((pthread_t) arg, NULL);
-
-  exit (42);
-}
-
-
-static void *
-tf2 (void *arg)
-{
-#ifdef WAIT_IN_CHILD
-  xpthread_barrier_wait (&b);
-
-  wait_code ();
-#endif
-
-  thread_join ((pthread_t) arg, NULL);
-
-  exit (43);
-}
-
-
-static int
-do_test (void)
-{
-#ifdef WAIT_IN_CHILD
-  xpthread_barrier_init (&b, NULL, 2);
-#endif
-
-  pthread_t th;
-
-  int err = thread_join (pthread_self (), NULL);
-  if (err == 0)
-    {
-      puts ("1st circular join succeeded");
-      return 1;
-    }
-  if (err != EDEADLK)
-    {
-      printf ("1st circular join %d, not EDEADLK\n", err);
-      return 1;
-    }
-
-  th = xpthread_create (NULL, tf1, (void *) pthread_self ());
-
-#ifndef WAIT_IN_CHILD
-  wait_code ();
-#endif
-
-  xpthread_cancel (th);
-
-#ifdef WAIT_IN_CHILD
-  xpthread_barrier_wait (&b);
-#endif
-
-  void *r;
-  err = thread_join (th, &r);
-  if (err != 0)
-    {
-      printf ("cannot join 1st thread: %d\n", err);
-      return 1;
-    }
-  if (r != PTHREAD_CANCELED)
-    {
-      puts ("1st thread not canceled");
-      return 1;
-    }
-
-  err = thread_join (pthread_self (), NULL);
-  if (err == 0)
-    {
-      puts ("2nd circular join succeeded");
-      return 1;
-    }
-  if (err != EDEADLK)
-    {
-      printf ("2nd circular join %d, not EDEADLK\n", err);
-      return 1;
-    }
-
-  th = xpthread_create (NULL, tf2, (void *) pthread_self ());
-
-#ifndef WAIT_IN_CHILD
-  wait_code ();
-#endif
-
-  xpthread_cancel (th);
-
-#ifdef WAIT_IN_CHILD
-  xpthread_barrier_wait (&b);
-#endif
-
-  if (thread_join (th, &r) != 0)
-    {
-      puts ("cannot join 2nd thread");
-      return 1;
-    }
-  if (r != PTHREAD_CANCELED)
-    {
-      puts ("2nd thread not canceled");
-      return 1;
-    }
-
-  err = thread_join (pthread_self (), NULL);
-  if (err == 0)
-    {
-      puts ("3rd circular join succeeded");
-      return 1;
-    }
-  if (err != EDEADLK)
-    {
-      printf ("3rd circular join %d, not EDEADLK\n", err);
-      return 1;
-    }
-
-  return 0;
-}
-
-#include <support/test-driver.c>
diff --git a/nptl/tst-join6.c b/nptl/tst-join6.c
deleted file mode 100644
index 0c9e7c056b..0000000000
--- a/nptl/tst-join6.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define WAIT_IN_CHILD 1
-#include "tst-join5.c"
diff --git a/nptl/tst-join7.c b/nptl/tst-join7.c
deleted file mode 100644
index c077d3cee3..0000000000
--- a/nptl/tst-join7.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Verify that TLS access in separate thread in a dlopened library does not
-   deadlock.
-   Copyright (C) 2015-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <dlfcn.h>
-
-/* When one dynamically loads a module, which spawns a thread to perform some
-   activities, it could be possible that TLS storage is accessed for the first
-   time in that thread.  This results in an allocation request within the
-   thread, which could result in an attempt to take the rtld load_lock.  This
-   is a problem because it would then deadlock with the dlopen (which owns the
-   lock), if the main thread is waiting for the spawned thread to exit.  We can
-   at least ensure that this problem does not occur due to accesses within
-   libc.so, by marking TLS variables within libc.so as IE.  The problem of an
-   arbitrary variable being accessed and constructed within such a thread still
-   exists but this test case does not verify that.  */
-
-int
-do_test (void)
-{
-  void *f = dlopen ("tst-join7mod.so", RTLD_NOW | RTLD_GLOBAL);
-  if (f)
-    dlclose (f);
-  else
-    return 1;
-
-  return 0;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/nptl/tst-join7mod.c b/nptl/tst-join7mod.c
deleted file mode 100644
index 934087dcc6..0000000000
--- a/nptl/tst-join7mod.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Verify that TLS access in separate thread in a dlopened library does not
-   deadlock - the module.
-   Copyright (C) 2015-2020 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
-   <https://www.gnu.org/licenses/>.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <atomic.h>
-
-static pthread_t th;
-static int running = 1;
-
-static void *
-test_run (void *p)
-{
-  while (atomic_load_relaxed (&running))
-    printf ("Test running\n");
-  printf ("Test finished\n");
-  return NULL;
-}
-
-static void __attribute__ ((constructor))
-do_init (void)
-{
-  int ret = pthread_create (&th, NULL, test_run, NULL);
-
-  if (ret != 0)
-    {
-      printf ("failed to create thread: %s (%d)\n", strerror (ret), ret);
-      exit (1);
-    }
-}
-
-static void __attribute__ ((destructor))
-do_end (void)
-{
-  atomic_store_relaxed (&running, 0);
-  int ret = pthread_join (th, NULL);
-
-  if (ret != 0)
-    {
-      printf ("pthread_join: %s(%d)\n", strerror (ret), ret);
-      exit (1);
-    }
-
-  printf ("Thread joined\n");
-}
diff --git a/nptl/tst-join8.c b/nptl/tst-join8.c
index 6232bbbd3b..3eddabab6f 100644
--- a/nptl/tst-join8.c
+++ b/nptl/tst-join8.c
@@ -17,4 +17,4 @@
    <https://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_TIMEDJOIN_NP 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join9.c b/nptl/tst-join9.c
index 6dc57e8477..e9d0f26146 100644
--- a/nptl/tst-join9.c
+++ b/nptl/tst-join9.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_TIMEDJOIN_NP 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>