7726edc273
2003-06-07 Ulrich Drepper <drepper@redhat.com> * cleanup_routine.c: New file. * Versions (libpthread) [GLIBC_2.3.3]: Add __pthread_cleanup_routine. * sysdeps/pthread/pthread.h: Add support for fully exception-based cleanup handling. * Makefile (libpthread-routines): Add cleanup_routine. Add more CFLAGS variables to compile with exceptions. Add comments why which file needs unwind tables. (tests) [have-forced-unwind==yes]: Add tst-cancelx* and tst-cleanupx* tests. * tst-cancelx1.c: New file. * tst-cancelx2.c: New file. * tst-cancelx3.c: New file. * tst-cancelx4.c: New file. * tst-cancelx5.c: New file. * tst-cancelx6.c: New file. * tst-cancelx7.c: New file. * tst-cancelx8.c: New file. * tst-cancelx9.c: New file. * tst-cancelx10.c: New file. * tst-cancelx11.c: New file. * tst-cancelx12.c: New file. * tst-cancelx13.c: New file. * tst-cancelx14.c: New file. * tst-cancelx15.c: New file. * tst-cleanupx0.c: New file. * tst-cleanupx0.expect: New file. * tst-cleanupx1.c: New file. * tst-cleanupx2.c: New file. * tst-cleanupx3.c: New file. * tst-cleanup0.c: Make standard compliant. * tst-cleanup1.c: Likewise. * sysdeps/unix/sysv/linux/sem_timedwait.c: Add cancellation support. * sysdeps/unix/sysv/linux/sem_wait.c: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/i386/i486/sem_wait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Likewise. * sysdeps/i386/tcb-offsets.sym: Add RESULT, CANCELHANDLING, and CLEANUP_JMP_BUF. * sysdeps/x86_64/tcb-offsets.sym: Likewise. * tst-cancel12.c: New file. * tst-cancel13.c: New file. * tst-cancel14.c: New file. * tst-cancel15.c: New file. * Makefile (tests): Add tst-cancel12, tst-cancel13, tst-cancel14, and tst-cancel15. * tst-cancel1.c: Add some comments. * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Compute relative timeout correctly.
130 lines
2.7 KiB
C
130 lines
2.7 KiB
C
/* Copyright (C) 2003 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#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);
|
|
}
|
|
|
|
printf ("cleanup call #%d\n", ncall);
|
|
}
|
|
|
|
|
|
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 ("tf: 1st barrier_wait failed");
|
|
exit (1);
|
|
}
|
|
|
|
/* This call should block and be cancelable. */
|
|
sem_wait (&sem);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
puts ("sem_wait returned");
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
pthread_t th;
|
|
|
|
if (pthread_barrier_init (&bar, NULL, 2) != 0)
|
|
{
|
|
puts ("barrier_init failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (sem_init (&sem, 0, 0) != 0)
|
|
{
|
|
puts ("sem_init failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pthread_create (&th, NULL, tf, NULL) != 0)
|
|
{
|
|
puts ("create failed");
|
|
exit (1);
|
|
}
|
|
|
|
int e = pthread_barrier_wait (&bar);
|
|
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
puts ("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 ("1st cancel failed");
|
|
exit (1);
|
|
}
|
|
|
|
void *r;
|
|
if (pthread_join (th, &r) != 0)
|
|
{
|
|
puts ("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"
|