mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +00:00
47677f2edc
This patch fixes both sem_wait and sem_timedwait cancellation point for
uncontended case. In this scenario only atomics are involved and thus
the futex cancellable call is not issue and a pending cancellation signal
is not handled.
The fix is straighforward by calling pthread_testcancel is both function
start. Although it would be simpler to call CANCELLATION_P directly, I
decided to add an internal pthread_testcancel alias and use it to export
less internal implementation on such function. A possible change on
how pthread_testcancel is internally implemented would lead to either
continue to force use CANCELLATION_P or to adjust its every use.
GLIBC testcase also does have tests for uncontended cases, test-cancel12
and test-cancel14.c, however both are flawed by adding another
cancellation point just after thread pthread_cleanup_pop:
47 static void *
48 tf (void *arg)
49 {
50 pthread_cleanup_push (cleanup, NULL);
51
52 int e = pthread_barrier_wait (&bar);
53 if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
54 {
55 puts ("tf: 1st barrier_wait failed");
56 exit (1);
57 }
58
59 /* This call should block and be cancelable. */
60 sem_wait (&sem);
61
62 pthread_cleanup_pop (0);
63
64 puts ("sem_wait returned");
65
66 return NULL;
67 }
So sem_{timed}wait does not act on cancellation, pthread_cleanup_pop executes
'cleanup' and then 'puts' acts on cancellation. Since pthread_cleanup_pop
removed the clean-up handler, it will ran only once and thus it won't accuse
an error to indicate sem_wait has not acted on the cancellation signal.
This patch also fixes this behavior by removing the cancellation point 'puts'.
It also adds some cleanup on all sem_{timed}wait cancel tests.
It partially fixes BZ #18243. Checked on x86_64.
[BZ #18243]
* nptl/pthreadP.h (__pthread_testcancel): Add prototype and hidden_proto.
* nptl/pthread_testcancel.c (pthread_cancel): Add internal aliais
definition.
* nptl/sem_timedwait.c (sem_timedwait): Add cancellation check for
uncontended case.
* nptl/sem_wait.c (__new_sem_wait): Likewise.
* nptl/tst-cancel12.c (cleanup): Remove wrong cancellation point.
(tf): Fix check for uncontended case.
(do_test): Likewise.
* nptl/tst-cancel13.c (cleanup): Remove wrong cancellation point.
(tf): Fix check for uncontended case.
(do_test): Likewise.
* nptl/tst-cancel14.c (cleanup): Remove wrong cancellation point.
(tf): Fix check for uncontended case.
(do_test): Likewise.
* nptl/tst-cancel15.c (cleanup): Remove wrong cancellation point.
(tf): Fix check for uncontended case.
(do_test): Likewise.
139 lines
2.9 KiB
C
139 lines
2.9 KiB
C
/* 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.
|
|
|
|
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 <errno.h>
|
|
#include <pthread.h>
|
|
#include <semaphore.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.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)
|
|
{
|
|
int e;
|
|
|
|
pthread_cleanup_push (cleanup, NULL);
|
|
|
|
e = pthread_barrier_wait (&bar);
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
puts ("error: tf: 1st barrier_wait failed");
|
|
exit (1);
|
|
}
|
|
|
|
struct timeval tv;
|
|
(void) gettimeofday (&tv, NULL);
|
|
|
|
struct timespec ts;
|
|
TIMEVAL_TO_TIMESPEC (&tv, &ts);
|
|
|
|
/* Timeout in 5 seconds. */
|
|
ts.tv_sec += 5;
|
|
|
|
/* This call should block and be cancelable. */
|
|
errno = 0;
|
|
e = sem_timedwait (&sem, &ts);
|
|
|
|
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);
|
|
}
|
|
|
|
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_timedwait. */
|
|
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 ("error: thread not canceled");
|
|
exit (1);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|