diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 4 | ||||
| -rw-r--r-- | nptl/tst-cancel13.c | 127 | ||||
| -rw-r--r-- | nptl/tst-cancelx13.c | 1 |
3 files changed, 1 insertions, 131 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 24ebd07a30..4602824bf1 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -278,7 +278,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-sem17 \ tst-tsd3 tst-tsd4 \ tst-cancel4 tst-cancel4_1 tst-cancel4_2 tst-cancel5 \ - tst-cancel7 tst-cancel13 \ + tst-cancel7 \ tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel24 \ tst-cleanup4 \ tst-signal3 \ @@ -358,7 +358,6 @@ endif LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst tests += tst-cancelx4 tst-cancelx5 tst-cancelx7 \ - tst-cancelx13 \ tst-cancelx16 tst-cancelx17 tst-cancelx20 \ tst-cleanupx4 @@ -477,7 +476,6 @@ CFLAGS-tst-cancelx5.c += -Wno-error CFLAGS-tst-cancelx4.c += -fexceptions CFLAGS-tst-cancelx5.c += -fexceptions CFLAGS-tst-cancelx7.c += -fexceptions -CFLAGS-tst-cancelx13.c += -fexceptions CFLAGS-tst-cancelx16.c += -fexceptions CFLAGS-tst-cancelx17.c += -fexceptions CFLAGS-tst-cancelx20.c += -fexceptions -fasynchronous-unwind-tables diff --git a/nptl/tst-cancel13.c b/nptl/tst-cancel13.c deleted file mode 100644 index 0b0086c4d3..0000000000 --- a/nptl/tst-cancel13.c +++ /dev/null @@ -1,127 +0,0 @@ -/* Test sem_wait cancellation for contended case. - 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 <semaphore.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - - -static pthread_barrier_t bar; -static sem_t sem; - - -static void -cleanup (void *arg) -{ - static int ncall; - - if (++ncall != 1) - { - puts ("second call to cleanup"); - exit (1); - } -} - - -static void * -tf (void *arg) -{ - pthread_cleanup_push (cleanup, NULL); - - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("error: tf: 1st barrier_wait failed"); - exit (1); - } - - /* This call should block and be cancelable. */ - sem_wait (&sem); - - pthread_cleanup_pop (0); - - return NULL; -} - - -static int -do_test (void) -{ - pthread_t th; - - if (pthread_barrier_init (&bar, NULL, 2) != 0) - { - puts ("error: barrier_init failed"); - exit (1); - } - - /* A value equal to 0 will check for contended pthread cancellation, - where the sem_wait operation will block. */ - if (sem_init (&sem, 0, 0) != 0) - { - puts ("error: sem_init failed"); - exit (1); - } - - if (pthread_create (&th, NULL, tf, NULL) != 0) - { - puts ("error: create failed"); - exit (1); - } - - int e = pthread_barrier_wait (&bar); - if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) - { - puts ("error: 1st barrier_wait failed"); - exit (1); - } - - /* Give the child a chance to go to sleep in sem_wait. */ - sleep (1); - - /* Check whether cancellation is honored when waiting in sem_wait. */ - if (pthread_cancel (th) != 0) - { - puts ("error: 1st cancel failed"); - exit (1); - } - - void *r; - if (pthread_join (th, &r) != 0) - { - puts ("error: join failed"); - exit (1); - } - - if (r != PTHREAD_CANCELED) - { - puts ("thread not canceled"); - exit (1); - } - - return 0; -} - - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" diff --git a/nptl/tst-cancelx13.c b/nptl/tst-cancelx13.c deleted file mode 100644 index 37c4c39c35..0000000000 --- a/nptl/tst-cancelx13.c +++ /dev/null @@ -1 +0,0 @@ -#include "tst-cancel13.c" |