Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Update.
2003-12-19 Ulrich Drepper <drepper@redhat.com> * eintr.c (setup_eintr): Add new parameter. Pass to thread function. (eintr_source): If ARG != NULL, use pthread_kill. * tst-eintr1.c: Adjust for this change. * tst-eintr2.c: Likewise. * Makefile (tests): Add tst-eintr3 and tst-eintr4. * tst-eintr3.c: New file. * tst-eintr4.c: New file. 2003-12-19 Jakub Jelinek <jakub@redhat.com> * libc-cancellation.c (__libc_enable_asynccancel): Don't cancel if CANCELSTATE_BITMASK is set. * sysdeps/pthread/librt-cancellation.c (__librt_enable_asynccancel): Likewise. * Makefile (tests): Add tst-cancel22 and tst-cancel23. (tests-reverse): Add tst-cancel23. * tst-cancel22.c: New test. * tst-cancel23.c: New test.
- Loading branch information
Ulrich Drepper
committed
Dec 20, 2003
1 parent
8a7455e
commit 4efdd8d
Showing
11 changed files
with
289 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,121 @@ | ||
/* Copyright (C) 2003 Free Software Foundation, Inc. | ||
This file is part of the GNU C Library. | ||
Contributed by Jakub Jelinek <jakub@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 <stdio.h> | ||
#include <stdlib.h> | ||
#include <unistd.h> | ||
|
||
pthread_barrier_t b; | ||
int seen; | ||
|
||
static void * | ||
tf (void *arg) | ||
{ | ||
int old; | ||
int r = pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old); | ||
if (r != 0) | ||
{ | ||
puts ("setcancelstate failed"); | ||
exit (1); | ||
} | ||
|
||
r = pthread_barrier_wait (&b); | ||
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) | ||
{ | ||
puts ("barrier_wait failed"); | ||
exit (1); | ||
} | ||
|
||
for (int i = 0; i < 10; ++i) | ||
{ | ||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 }; | ||
TEMP_FAILURE_RETRY (nanosleep (&ts, &ts)); | ||
} | ||
|
||
seen = 1; | ||
pthread_setcancelstate (old, NULL); | ||
|
||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 }; | ||
TEMP_FAILURE_RETRY (nanosleep (&ts, &ts)); | ||
|
||
exit (1); | ||
} | ||
|
||
|
||
static int | ||
do_test (void) | ||
{ | ||
if (pthread_barrier_init (&b, NULL, 2) != 0) | ||
{ | ||
puts ("barrier init failed"); | ||
return 1; | ||
} | ||
|
||
pthread_t th; | ||
if (pthread_create (&th, NULL, tf, NULL) != 0) | ||
{ | ||
puts ("thread creation failed"); | ||
return 1; | ||
} | ||
|
||
int r = pthread_barrier_wait (&b); | ||
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) | ||
{ | ||
puts ("barrier_wait failed"); | ||
return 1; | ||
} | ||
|
||
if (pthread_cancel (th) != 0) | ||
{ | ||
puts ("cancel failed"); | ||
return 1; | ||
} | ||
|
||
void *status; | ||
if (pthread_join (th, &status) != 0) | ||
{ | ||
puts ("join failed"); | ||
return 1; | ||
} | ||
if (status != PTHREAD_CANCELED) | ||
{ | ||
puts ("thread not canceled"); | ||
return 1; | ||
} | ||
|
||
if (pthread_barrier_destroy (&b) != 0) | ||
{ | ||
puts ("barrier_destroy failed"); | ||
return 1; | ||
} | ||
|
||
if (seen != 1) | ||
{ | ||
puts ("thread cancelled when PTHREAD_CANCEL_DISABLED"); | ||
return 1; | ||
} | ||
|
||
return 0; | ||
} | ||
|
||
#define TIMEOUT 5 | ||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
#include "tst-cancel22.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
/* 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 "eintr.c" | ||
|
||
|
||
static void * | ||
tf (void *arg) | ||
{ | ||
pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; | ||
pthread_mutex_lock (&m); | ||
/* This call must not return. */ | ||
pthread_mutex_lock (&m); | ||
|
||
puts ("tf: mutex_lock returned"); | ||
exit (1); | ||
} | ||
|
||
|
||
static int | ||
do_test (void) | ||
{ | ||
pthread_t self = pthread_self (); | ||
|
||
setup_eintr (SIGUSR1, &self); | ||
|
||
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_join (th, NULL); | ||
|
||
if (e == EINTR) | ||
puts ("pthread_join returned with EINTR"); | ||
|
||
return 0; | ||
} | ||
|
||
#define EXPECTED_SIGNAL SIGALRM | ||
#define TIMEOUT 1 | ||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* 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 "eintr.c" | ||
|
||
|
||
static int | ||
do_test (void) | ||
{ | ||
pthread_t self = pthread_self (); | ||
|
||
setup_eintr (SIGUSR1, &self); | ||
|
||
pthread_barrier_t b; | ||
if (pthread_barrier_init (&b, NULL, 2) != 0) | ||
{ | ||
puts ("barrier_init failed"); | ||
exit (1); | ||
} | ||
|
||
/* This call must never return. */ | ||
int e = pthread_barrier_wait (&b); | ||
|
||
if (e == EINTR) | ||
puts ("pthread_join returned with EINTR"); | ||
|
||
return 0; | ||
} | ||
|
||
#define EXPECTED_SIGNAL SIGALRM | ||
#define TIMEOUT 1 | ||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |