diff options
Diffstat (limited to 'nptl/tst-cancel15.c')
-rw-r--r-- | nptl/tst-cancel15.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/nptl/tst-cancel15.c b/nptl/tst-cancel15.c index f413839ec2..c8db3e42b2 100644 --- a/nptl/tst-cancel15.c +++ b/nptl/tst-cancel15.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2003-2016 Free Software Foundation, Inc. +/* Test sem_timedwait cancellation for contended case. + Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. @@ -40,8 +41,6 @@ cleanup (void *arg) puts ("second call to cleanup"); exit (1); } - - printf ("cleanup call #%d\n", ncall); } @@ -55,7 +54,7 @@ tf (void *arg) e = pthread_barrier_wait (&bar); if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) { - puts ("tf: 1st barrier_wait failed"); + puts ("error: tf: 1st barrier_wait failed"); exit (1); } @@ -74,8 +73,6 @@ tf (void *arg) pthread_cleanup_pop (0); - printf ("sem_timedwait returned, e = %d, errno = %d\n", e, errno); - return NULL; } @@ -87,26 +84,26 @@ do_test (void) if (pthread_barrier_init (&bar, NULL, 2) != 0) { - puts ("barrier_init failed"); + puts ("error: barrier_init failed"); exit (1); } if (sem_init (&sem, 0, 0) != 0) { - puts ("sem_init failed"); + puts ("error: sem_init failed"); exit (1); } if (pthread_create (&th, NULL, tf, NULL) != 0) { - puts ("create failed"); + puts ("error: create failed"); exit (1); } int e = pthread_barrier_wait (&bar); if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD) { - puts ("1st barrier_wait failed"); + puts ("error: 1st barrier_wait failed"); exit (1); } @@ -116,20 +113,20 @@ do_test (void) /* Check whether cancellation is honored when waiting in sem_timedwait. */ if (pthread_cancel (th) != 0) { - puts ("1st cancel failed"); + puts ("error: 1st cancel failed"); exit (1); } void *r; if (pthread_join (th, &r) != 0) { - puts ("join failed"); + puts ("error: join failed"); exit (1); } if (r != PTHREAD_CANCELED) { - puts ("thread not canceled"); + puts ("error: thread not canceled"); exit (1); } |