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.
* sysdeps/unix/clock_nanosleep.c (clock_nanosleep): nanosleep takes care of enabling cancellation. * sysdeps/pthread/aio_suspend.c (aio_suspend): Make aio_suspend cancelable. It's not correct to disable cancellation. Instead of a cleanup handler.
- Loading branch information
Ulrich Drepper
committed
Jun 17, 2003
1 parent
aa3cee2
commit 60d73a7
Showing
9 changed files
with
282 additions
and
20 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#include <nptl/pthreadP.h> | ||
#include "../../../../../sysdeps/unix/sysv/linux/sigtimedwait.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,2 @@ | ||
#include <nptl/pthreadP.h> | ||
#include "../../../../../sysdeps/unix/sysv/linux/sigwait.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,2 @@ | ||
#include <nptl/pthreadP.h> | ||
#include "../../../../../sysdeps/unix/sysv/linux/sigwaitinfo.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,205 @@ | ||
/* 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 <aio.h> | ||
#include <pthread.h> | ||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <string.h> | ||
#include <unistd.h> | ||
|
||
|
||
static pthread_barrier_t b; | ||
|
||
|
||
/* Cleanup handling test. */ | ||
static int cl_called; | ||
|
||
static void | ||
cl (void *arg) | ||
{ | ||
++cl_called; | ||
} | ||
|
||
|
||
static void * | ||
tf (void *arg) | ||
{ | ||
int r = pthread_barrier_wait (&b); | ||
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) | ||
{ | ||
puts ("barrier_wait failed"); | ||
exit (1); | ||
} | ||
|
||
pthread_cleanup_push (cl, NULL); | ||
|
||
const struct aiocb *l[1] = { arg }; | ||
|
||
aio_suspend (l, 1, NULL); | ||
|
||
pthread_cleanup_pop (0); | ||
|
||
puts ("aio_suspend returned"); | ||
|
||
exit (1); | ||
} | ||
|
||
|
||
static int | ||
do_test (void) | ||
{ | ||
int fds[2]; | ||
if (pipe (fds) != 0) | ||
{ | ||
puts ("pipe failed"); | ||
return 1; | ||
} | ||
|
||
struct aiocb a; | ||
char mem[1]; | ||
memset (&a, '\0', sizeof (a)); | ||
a.aio_fildes = fds[0]; | ||
a.aio_buf = mem; | ||
a.aio_nbytes = sizeof (mem); | ||
if (aio_read (&a) != 0) | ||
{ | ||
puts ("aio_read failed"); | ||
return 1; | ||
} | ||
|
||
if (pthread_barrier_init (&b, NULL, 2) != 0) | ||
{ | ||
puts ("barrier_init failed"); | ||
return 1; | ||
} | ||
|
||
pthread_t th; | ||
if (pthread_create (&th, NULL, tf, &a) != 0) | ||
{ | ||
puts ("1st create failed"); | ||
return 1; | ||
} | ||
|
||
int r = pthread_barrier_wait (&b); | ||
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) | ||
{ | ||
puts ("barrier_wait failed"); | ||
exit (1); | ||
} | ||
|
||
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 }; | ||
while (nanosleep (&ts, &ts) != 0) | ||
continue; | ||
|
||
puts ("going to cancel in-time"); | ||
if (pthread_cancel (th) != 0) | ||
{ | ||
puts ("1st cancel failed"); | ||
return 1; | ||
} | ||
|
||
void *status; | ||
if (pthread_join (th, &status) != 0) | ||
{ | ||
puts ("1st join failed"); | ||
return 1; | ||
} | ||
if (status != PTHREAD_CANCELED) | ||
{ | ||
puts ("1st thread not canceled"); | ||
return 1; | ||
} | ||
|
||
if (cl_called == 0) | ||
{ | ||
puts ("cleanup handler not called"); | ||
return 1; | ||
} | ||
if (cl_called > 1) | ||
{ | ||
puts ("cleanup handler called more than once"); | ||
return 1; | ||
} | ||
|
||
puts ("in-time cancellation succeeded"); | ||
aio_cancel (fds[0], &a); | ||
|
||
|
||
cl_called = 0; | ||
|
||
memset (&a, '\0', sizeof (a)); | ||
a.aio_fildes = fds[1]; | ||
a.aio_buf = mem; | ||
a.aio_nbytes = sizeof (mem); | ||
if (aio_write (&a) != 0) | ||
{ | ||
puts ("aio_write failed"); | ||
return 1; | ||
} | ||
|
||
if (pthread_create (&th, NULL, tf, &a) != 0) | ||
{ | ||
puts ("2nd create failed"); | ||
return 1; | ||
} | ||
|
||
puts ("going to cancel early"); | ||
if (pthread_cancel (th) != 0) | ||
{ | ||
puts ("2nd cancel failed"); | ||
return 1; | ||
} | ||
|
||
r = pthread_barrier_wait (&b); | ||
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) | ||
{ | ||
puts ("barrier_wait failed"); | ||
exit (1); | ||
} | ||
|
||
if (pthread_join (th, &status) != 0) | ||
{ | ||
puts ("2nd join failed"); | ||
return 1; | ||
} | ||
if (status != PTHREAD_CANCELED) | ||
{ | ||
puts ("2nd thread not canceled"); | ||
return 1; | ||
} | ||
|
||
if (cl_called == 0) | ||
{ | ||
printf ("cleanup handler not called\n"); | ||
return 1; | ||
} | ||
if (cl_called > 1) | ||
{ | ||
printf ("cleanup handler called more than once\n"); | ||
return 1; | ||
} | ||
|
||
puts ("early cancellation succeeded"); | ||
|
||
return 0; | ||
} | ||
|
||
#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-cancel17.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