mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
Update.
2003-12-21 Ulrich Drepper <drepper@redhat.com> * Makefile (tests): Add tst-eintr5. * tst-eintr5.c: New file. * eintr.c (eintr_source): Prevent sending signal to self. * tst-eintr2.c (tf1): Improve error message.
This commit is contained in:
parent
26f0119e7a
commit
33ebea1784
@ -1,3 +1,12 @@
|
||||
2003-12-21 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* Makefile (tests): Add tst-eintr5.
|
||||
* tst-eintr5.c: New file.
|
||||
|
||||
* eintr.c (eintr_source): Prevent sending signal to self.
|
||||
|
||||
* tst-eintr2.c (tf1): Improve error message.
|
||||
|
||||
2003-12-20 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/Makefile (CFLAGS-getpid.c): Define.
|
||||
|
@ -207,7 +207,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
|
||||
tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
|
||||
tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 \
|
||||
tst-detach1 \
|
||||
tst-eintr1 tst-eintr2 tst-eintr3 tst-eintr4 \
|
||||
tst-eintr1 tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
|
||||
tst-tsd1 tst-tsd2 tst-tsd3 tst-tsd4 \
|
||||
tst-tls1 tst-tls2 \
|
||||
tst-fork1 tst-fork2 tst-fork3 tst-fork4 \
|
||||
|
@ -42,6 +42,14 @@ eintr_source (void *arg)
|
||||
{
|
||||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 500000 };
|
||||
|
||||
if (arg == NULL)
|
||||
{
|
||||
sigset_t ss;
|
||||
sigemptyset (&ss);
|
||||
sigaddset (&ss, the_sig);
|
||||
pthread_sigmask (SIG_BLOCK, &ss, NULL);
|
||||
}
|
||||
|
||||
while (1)
|
||||
{
|
||||
if (arg != NULL)
|
||||
|
81
nptl/tst-eintr5.c
Normal file
81
nptl/tst-eintr5.c
Normal file
@ -0,0 +1,81 @@
|
||||
/* 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 <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "eintr.c"
|
||||
|
||||
|
||||
static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_cond_t c = PTHREAD_COND_INITIALIZER;
|
||||
|
||||
|
||||
static void *
|
||||
tf (void *arg)
|
||||
{
|
||||
struct timespec ts;
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday (&tv, NULL);
|
||||
TIMEVAL_TO_TIMESPEC (&tv, &ts);
|
||||
ts.tv_sec += 10000;
|
||||
|
||||
/* This call must never return. */
|
||||
int e = pthread_cond_timedwait (&c, &m, &ts);
|
||||
char buf[100];
|
||||
printf ("tf: cond_timedwait returned: %s\n",
|
||||
strerror_r (e, buf, sizeof (buf)));
|
||||
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
setup_eintr (SIGUSR1, NULL);
|
||||
|
||||
pthread_t th;
|
||||
char buf[100];
|
||||
int e = pthread_create (&th, NULL, tf, NULL);
|
||||
if (e != 0)
|
||||
{
|
||||
printf ("main: pthread_create failed: %s\n",
|
||||
strerror_r (e, buf, sizeof (buf)));
|
||||
exit (1);
|
||||
}
|
||||
|
||||
/* This call must never return. */
|
||||
e = pthread_cond_wait (&c, &m);
|
||||
printf ("main: cond_wait returned: %s\n",
|
||||
strerror_r (e, buf, sizeof (buf)));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define EXPECTED_SIGNAL SIGALRM
|
||||
#define TIMEOUT 3
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../test-skeleton.c"
|
Loading…
Reference in New Issue
Block a user