aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-07 14:02:18 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-07 16:14:23 +0200
commit4bab9ad854b50fab23eacf29550325552e7a9f4b (patch)
tree0d0603cee6d95d39db2f457b2f232883a4cd2bd1 /nptl
parent7b6b18319ee6441bbec89fb0568a4bf7ba96e3d0 (diff)
downloadglibc-4bab9ad854b50fab23eacf29550325552e7a9f4b.tar
glibc-4bab9ad854b50fab23eacf29550325552e7a9f4b.tar.gz
glibc-4bab9ad854b50fab23eacf29550325552e7a9f4b.tar.bz2
glibc-4bab9ad854b50fab23eacf29550325552e7a9f4b.zip
htl: Enable but XFAIL tst-flock2, tst-signal1, tst-signal2
They need setpshared support. * nptl/tst-flock2.c, tst-signal1.c, tst-signal2.c: Move to... * sysdeps/pthread: ... here. * nptl/Makefile: Move corresponding tests references to... * sysdeps/pthread/Makefile: ... here. * sysdeps/mach/hurd/i386/Makefile (test-xfail-tst-flock2, test-xfail-tst-signal1, test-xfail-tst-signal2): Add.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/tst-flock2.c259
-rw-r--r--nptl/tst-signal1.c188
-rw-r--r--nptl/tst-signal2.c197
4 files changed, 1 insertions, 646 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index b1e60d303f..9b549454f1 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -282,8 +282,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel21 tst-cancel24 \
tst-cancel-self tst-cancel-self-cancelstate \
tst-cleanup4 \
- tst-flock2 \
- tst-signal1 tst-signal2 tst-signal3 \
+ tst-signal3 \
tst-exec4 tst-exec5 \
tst-stack2 tst-stack3 tst-stack4 \
tst-pthread-attr-affinity \
diff --git a/nptl/tst-flock2.c b/nptl/tst-flock2.c
deleted file mode 100644
index 62a9117da9..0000000000
--- a/nptl/tst-flock2.c
+++ /dev/null
@@ -1,259 +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 <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-
-
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t lock2 = PTHREAD_MUTEX_INITIALIZER;
-static int fd;
-
-
-static void *
-tf (void *arg)
-{
- struct flock fl =
- {
- .l_type = F_WRLCK,
- .l_start = 0,
- .l_whence = SEEK_SET,
- .l_len = 10
- };
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLKW, &fl)) != 0)
- {
- puts ("fourth fcntl failed");
- exit (1);
- }
-
- pthread_mutex_unlock (&lock);
-
- pthread_mutex_lock (&lock2);
-
- return NULL;
-}
-
-
-static int
-do_test (void)
-{
- char tmp[] = "/tmp/tst-flock2-XXXXXX";
-
- fd = mkstemp (tmp);
- if (fd == -1)
- {
- puts ("mkstemp failed");
- return 1;
- }
-
- unlink (tmp);
-
- int i;
- for (i = 0; i < 20; ++i)
- write (fd, "foobar xyzzy", 12);
-
- pthread_barrier_t *b;
- b = mmap (NULL, sizeof (pthread_barrier_t), PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, 0);
- if (b == MAP_FAILED)
- {
- puts ("mmap failed");
- return 1;
- }
-
- pthread_barrierattr_t ba;
- if (pthread_barrierattr_init (&ba) != 0)
- {
- puts ("barrierattr_init failed");
- return 1;
- }
-
- if (pthread_barrierattr_setpshared (&ba, PTHREAD_PROCESS_SHARED) != 0)
- {
- puts ("barrierattr_setpshared failed");
- return 1;
- }
-
- if (pthread_barrier_init (b, &ba, 2) != 0)
- {
- puts ("barrier_init failed");
- return 1;
- }
-
- if (pthread_barrierattr_destroy (&ba) != 0)
- {
- puts ("barrierattr_destroy failed");
- return 1;
- }
-
- struct flock fl =
- {
- .l_type = F_WRLCK,
- .l_start = 0,
- .l_whence = SEEK_SET,
- .l_len = 10
- };
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLKW, &fl)) != 0)
- {
- puts ("first fcntl failed");
- return 1;
- }
-
- pid_t pid = fork ();
- if (pid == -1)
- {
- puts ("fork failed");
- return 1;
- }
-
- if (pid == 0)
- {
- /* Make sure the child does not stay around indefinitely. */
- alarm (10);
-
- /* Try to get the lock. */
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLK, &fl)) == 0)
- {
- puts ("child: second flock succeeded");
- return 1;
- }
- }
-
- pthread_barrier_wait (b);
-
- if (pid != 0)
- {
- fl.l_type = F_UNLCK;
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLKW, &fl)) != 0)
- {
- puts ("third fcntl failed");
- return 1;
- }
- }
-
- pthread_barrier_wait (b);
-
- pthread_t th;
- if (pid == 0)
- {
- if (pthread_mutex_lock (&lock) != 0)
- {
- puts ("1st locking of lock failed");
- return 1;
- }
-
- if (pthread_mutex_lock (&lock2) != 0)
- {
- puts ("1st locking of lock2 failed");
- return 1;
- }
-
- if (pthread_create (&th, NULL, tf, NULL) != 0)
- {
- puts ("pthread_create failed");
- return 1;
- }
-
- if (pthread_mutex_lock (&lock) != 0)
- {
- puts ("2nd locking of lock failed");
- return 1;
- }
-
- puts ("child locked file");
- }
-
- pthread_barrier_wait (b);
-
- if (pid != 0)
- {
- fl.l_type = F_WRLCK;
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLK, &fl)) == 0)
- {
- puts ("fifth fcntl succeeded");
- return 1;
- }
-
- puts ("file locked by child");
- }
-
- pthread_barrier_wait (b);
-
- if (pid == 0)
- {
- if (pthread_mutex_unlock (&lock2) != 0)
- {
- puts ("unlock of lock2 failed");
- return 1;
- }
-
- if (pthread_join (th, NULL) != 0)
- {
- puts ("join failed");
- return 1;
- }
-
- puts ("child's thread terminated");
- }
-
- pthread_barrier_wait (b);
-
- if (pid != 0)
- {
- fl.l_type = F_WRLCK;
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLK, &fl)) == 0)
- {
- puts ("fifth fcntl succeeded");
- return 1;
- }
-
- puts ("file still locked");
- }
-
- pthread_barrier_wait (b);
-
- if (pid == 0)
- {
- _exit (0);
- }
-
- int status;
- if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("waitpid failed");
- return 1;
- }
- puts ("child terminated");
-
- if (TEMP_FAILURE_RETRY (fcntl (fd, F_SETLKW, &fl)) != 0)
- {
- puts ("sixth fcntl failed");
- return 1;
- }
-
- return status;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/nptl/tst-signal1.c b/nptl/tst-signal1.c
deleted file mode 100644
index 2779213dc2..0000000000
--- a/nptl/tst-signal1.c
+++ /dev/null
@@ -1,188 +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 <errno.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-
-
-static sigset_t ss;
-static pthread_barrier_t *b;
-
-
-static void *
-tf (void *arg)
-{
- sigdelset (&ss, SIGINT);
-
- if (pthread_sigmask (SIG_SETMASK, &ss, NULL) != 0)
- {
- puts ("2nd pthread_sigmask failed");
- exit (1);
- }
-
- pthread_barrier_wait (b);
-
- int sig;
- int res = sigwait (&ss, &sig);
- if (res == 0)
- {
- printf ("sigwait returned successfully with signal %d\n", sig);
- exit (1);
- }
-
- printf ("sigwait returned with %s (%d)\n", strerror (res), res);
-
- return NULL;
-}
-
-
-static void
-receiver (void)
-{
- pthread_t th;
-
- /* Make sure the process doesn't run forever. */
- alarm (10);
-
- sigfillset (&ss);
-
- if (pthread_sigmask (SIG_SETMASK, &ss, NULL) != 0)
- {
- puts ("1st pthread_sigmask failed");
- exit (1);
- }
-
- if (pthread_create (&th, NULL, tf, NULL) != 0)
- {
- puts ("pthread_create failed");
- exit (1);
- }
-
- if (pthread_join (th, NULL) == 0)
- {
- puts ("thread joined?!");
- exit (1);
- }
-
- _exit (0);
-}
-
-
-static int
-do_test (void)
-{
- char tmp[] = "/tmp/tst-signal1-XXXXXX";
-
- int fd = mkstemp (tmp);
- if (fd == -1)
- {
- puts ("mkstemp failed");
- exit (1);
- }
-
- unlink (tmp);
-
- int i;
- for (i = 0; i < 20; ++i)
- write (fd, "foobar xyzzy", 12);
-
- b = mmap (NULL, sizeof (pthread_barrier_t), PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, 0);
- if (b == MAP_FAILED)
- {
- puts ("mmap failed");
- exit (1);
- }
-
- pthread_barrierattr_t ba;
- if (pthread_barrierattr_init (&ba) != 0)
- {
- puts ("barrierattr_init failed");
- exit (1);
- }
-
- if (pthread_barrierattr_setpshared (&ba, PTHREAD_PROCESS_SHARED) != 0)
- {
- puts ("barrierattr_setpshared failed");
- exit (1);
- }
-
- if (pthread_barrier_init (b, &ba, 2) != 0)
- {
- puts ("barrier_init failed");
- exit (1);
- }
-
- if (pthread_barrierattr_destroy (&ba) != 0)
- {
- puts ("barrierattr_destroy failed");
- exit (1);
- }
-
- pid_t pid = fork ();
- if (pid == -1)
- {
- puts ("fork failed");
- exit (1);
- }
-
- if (pid == 0)
- receiver ();
-
- pthread_barrier_wait (b);
-
- /* Wait a bit more. */
- struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 };
- nanosleep (&ts, NULL);
-
- /* Send the signal. */
- puts ("sending the signal now");
- kill (pid, SIGINT);
-
- /* Wait for the process to terminate. */
- int status;
- if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("wrong child reported terminated");
- exit (1);
- }
-
- if (!WIFSIGNALED (status))
- {
- puts ("child wasn't signalled");
- exit (1);
- }
-
- if (WTERMSIG (status) != SIGINT)
- {
- puts ("child not terminated with SIGINT");
- exit (1);
- }
-
- return 0;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/nptl/tst-signal2.c b/nptl/tst-signal2.c
deleted file mode 100644
index 53e0ca6377..0000000000
--- a/nptl/tst-signal2.c
+++ /dev/null
@@ -1,197 +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 <errno.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <string.h>
-
-
-static sigset_t ss;
-static pthread_barrier_t *b;
-
-
-static void *
-tf (void *arg)
-{
- pthread_barrier_wait (b);
-
- puts ("child: calling sigwait now");
-
- int sig;
- int err;
- err = sigwait (&ss, &sig);
- if (err != 0)
- {
- printf ("sigwait returned unsuccessfully: %s (%d)\n",
- strerror (err), err);
- _exit (1);
- }
-
- puts ("sigwait returned");
-
- if (sig != SIGINT)
- {
- printf ("caught signal %d, expected %d (SIGINT)\n", sig, SIGINT);
- _exit (1);
- }
-
- puts ("child thread terminating now");
-
- return NULL;
-}
-
-
-static void
-receiver (void)
-{
- pthread_t th;
-
- /* Make sure the process doesn't run forever. */
- alarm (10);
-
- sigfillset (&ss);
-
- if (pthread_sigmask (SIG_SETMASK, &ss, NULL) != 0)
- {
- puts ("1st pthread_sigmask failed");
- _exit (1);
- }
-
- if (pthread_create (&th, NULL, tf, NULL) != 0)
- {
- puts ("pthread_create failed");
- _exit (1);
- }
-
- if (pthread_join (th, NULL) != 0)
- {
- puts ("thread didn't join");
- _exit (1);
- }
-
- puts ("join succeeded");
-
- _exit (0);
-}
-
-
-static int
-do_test (void)
-{
- char tmp[] = "/tmp/tst-signal1-XXXXXX";
-
- int fd = mkstemp (tmp);
- if (fd == -1)
- {
- puts ("mkstemp failed");
- exit (1);
- }
-
- unlink (tmp);
-
- int i;
- for (i = 0; i < 20; ++i)
- write (fd, "foobar xyzzy", 12);
-
- b = mmap (NULL, sizeof (pthread_barrier_t), PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, 0);
- if (b == MAP_FAILED)
- {
- puts ("mmap failed");
- exit (1);
- }
-
- pthread_barrierattr_t ba;
- if (pthread_barrierattr_init (&ba) != 0)
- {
- puts ("barrierattr_init failed");
- exit (1);
- }
-
- if (pthread_barrierattr_setpshared (&ba, PTHREAD_PROCESS_SHARED) != 0)
- {
- puts ("barrierattr_setpshared failed");
- exit (1);
- }
-
- if (pthread_barrier_init (b, &ba, 2) != 0)
- {
- puts ("barrier_init failed");
- exit (1);
- }
-
- if (pthread_barrierattr_destroy (&ba) != 0)
- {
- puts ("barrierattr_destroy failed");
- exit (1);
- }
-
- pid_t pid = fork ();
- if (pid == -1)
- {
- puts ("fork failed");
- exit (1);
- }
-
- if (pid == 0)
- receiver ();
-
- pthread_barrier_wait (b);
-
- /* Wait a bit more. */
- struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 };
- nanosleep (&ts, NULL);
-
- /* Send the signal. */
- puts ("sending the signal now");
- kill (pid, SIGINT);
-
- /* Wait for the process to terminate. */
- int status;
- if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("wrong child reported terminated");
- exit (1);
- }
-
- if (!WIFEXITED (status))
- {
- if (WIFSIGNALED (status))
- printf ("child exited with signal %d\n", WTERMSIG (status));
- else
- puts ("child didn't exit normally");
- exit (1);
- }
-
- if (WEXITSTATUS (status) != 0)
- {
- printf ("exit status %d != 0\n", WEXITSTATUS (status));
- exit (1);
- }
-
- return 0;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"