2003-02-21  Ulrich Drepper  <drepper@redhat.com>

	* Makefile (tests): Remove tst-basic7.  Add tst-kill1, tst-kill2,
	tst-kill3, tst-kill4.
This commit is contained in:
Ulrich Drepper 2003-02-21 20:29:49 +00:00
parent 6f50cb0027
commit ab2d98e38e
6 changed files with 403 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2003-02-21 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Remove tst-basic7. Add tst-kill1, tst-kill2,
tst-kill3, tst-kill4.
2003-02-21 Roland McGrath <roland@redhat.com>
* Makefile (install-lib-ldscripts): New variable.

View File

@ -138,7 +138,7 @@ tests = tst-attr1 tst-attr2 \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 \
tst-barrier1 tst-barrier2 tst-barrier3 \
tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
tst-basic7 \
tst-kill1 tst-kill2 tst-kill3 tst-kill4 \
tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 \
tst-tsd1 tst-tsd2 \
tst-fork1 tst-fork2 tst-fork3 \

100
nptl/tst-kill1.c Normal file
View File

@ -0,0 +1,100 @@
/* 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 <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
static pthread_barrier_t b;
static void *
tf (void *a)
{
if (pthread_mutex_lock (&m) != 0)
{
puts ("child: mutex_lock failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("child: barrier_wait failed");
exit (1);
}
/* This call should never return. */
pthread_cond_wait (&c, &m);
return NULL;
}
int
do_test (void)
{
pthread_t th;
if (pthread_barrier_init (&b, NULL, 2) != 0)
{
puts ("barrier_init failed");
exit (1);
}
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
puts ("create failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("barrier_wait failed");
exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("mutex_lock failed");
exit (1);
}
/* Send the thread a signal which it doesn't catch and which will
cause the process to terminate. */
if (pthread_kill (th, SIGUSR1) != 0)
{
puts ("kill failed");
exit (1);
}
/* This call should never return. */
pthread_join (th, NULL);
return 0;
}
#define EXPECTED_SIGNAL SIGUSR1
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

139
nptl/tst-kill2.c Normal file
View File

@ -0,0 +1,139 @@
/* 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 <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
static pthread_barrier_t b;
static void *
tf (void *a)
{
/* Block SIGUSR1. */
sigset_t ss;
sigemptyset (&ss);
sigaddset (&ss, SIGUSR1);
if (pthread_sigmask (SIG_BLOCK, &ss, NULL) != 0)
{
puts ("child: sigmask failed");
exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("child: mutex_lock failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("child: barrier_wait failed");
exit (1);
}
/* Compute timeout. */
struct timeval tv;
(void) gettimeofday (&tv, NULL);
struct timespec ts;
TIMEVAL_TO_TIMESPEC (&tv, &ts);
/* Timeout: 1sec. */
ts.tv_sec += 1;
/* This call should never return. */
if (pthread_cond_timedwait (&c, &m, &ts) != ETIMEDOUT)
{
puts ("cond_timedwait didn't time out");
exit (1);
}
return NULL;
}
int
do_test (void)
{
pthread_t th;
if (pthread_barrier_init (&b, NULL, 2) != 0)
{
puts ("barrier_init failed");
exit (1);
}
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
puts ("create failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("barrier_wait failed");
exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("mutex_lock failed");
exit (1);
}
/* Send the thread a signal which it has blocked. */
if (pthread_kill (th, SIGUSR1) != 0)
{
puts ("kill failed");
exit (1);
}
if (pthread_mutex_unlock (&m) != 0)
{
puts ("mutex_unlock failed");
exit (1);
}
void *r;
if (pthread_join (th, &r) != 0)
{
puts ("join failed");
exit (1);
}
if (r != NULL)
{
puts ("return value wrong");
exit (1);
}
return 0;
}
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

158
nptl/tst-kill3.c Normal file
View File

@ -0,0 +1,158 @@
/* 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 <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
static pthread_barrier_t b;
static void
handler (int sig)
{
write (1, "handler called\n", 15);
_exit (1);
}
static void *
tf (void *a)
{
/* Block SIGUSR1. */
sigset_t ss;
sigemptyset (&ss);
sigaddset (&ss, SIGUSR1);
if (pthread_sigmask (SIG_BLOCK, &ss, NULL) != 0)
{
puts ("child: sigmask failed");
exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("child: mutex_lock failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("child: barrier_wait failed");
exit (1);
}
/* Compute timeout. */
struct timeval tv;
(void) gettimeofday (&tv, NULL);
struct timespec ts;
TIMEVAL_TO_TIMESPEC (&tv, &ts);
/* Timeout: 1sec. */
ts.tv_sec += 1;
/* This call should never return. */
if (pthread_cond_timedwait (&c, &m, &ts) != ETIMEDOUT)
{
puts ("cond_timedwait didn't time out");
exit (1);
}
return NULL;
}
int
do_test (void)
{
pthread_t th;
struct sigaction sa;
sigemptyset (&sa.sa_mask);
sa.sa_flags = 0;
sa.sa_handler = handler;
if (sigaction (SIGUSR1, &sa, NULL) != 0)
{
puts ("sigaction failed");
exit (1);
}
if (pthread_barrier_init (&b, NULL, 2) != 0)
{
puts ("barrier_init failed");
exit (1);
}
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
puts ("create failed");
exit (1);
}
int e = pthread_barrier_wait (&b);
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
puts ("barrier_wait failed");
exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("mutex_lock failed");
exit (1);
}
/* Send the thread a signal which it has blocked. */
if (pthread_kill (th, SIGUSR1) != 0)
{
puts ("kill failed");
exit (1);
}
if (pthread_mutex_unlock (&m) != 0)
{
puts ("mutex_unlock failed");
exit (1);
}
void *r;
if (pthread_join (th, &r) != 0)
{
puts ("join failed");
exit (1);
}
if (r != NULL)
{
puts ("return value wrong");
exit (1);
}
return 0;
}
#define TIMEOUT 5
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"