OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nptl: Add more coverage in tst-cancel4 

This patch adds early cancel test for open syscall through a FIFO
(thus makign subsequent call to open block until the other end is
also opened).

It also cleanup the sigpause tests by using sigpause along with
SIGINT instead of __xpg_sigpause and SIGCANCEL.  Since the idea
is just to test the cancellation handling there is no need to expose
internal glibc implementation details to the test through pthreadP.h
inclusion.

Tested x86_64.

	* nptl/tst-cancel4-common.c (do_test): Add temporary fifo creation.
	* nptl/tst-cancel4-common.h (fifoname): New variable.
	(fifofd): Likewise.
	(cl_fifo): New function.
	* nptl/tst-cancel4.c (tf_sigpause): Replace SIGCANCEL usage by
	SIGINT.
	(tf_open): Add early cancel test.
This commit is contained in:
Adhemerval Zanella 2016-06-14 12:18:32 -03:00
parent 87523e9c36
commit 2918b0d0ec
4 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2016-07-05 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* nptl/tst-cancel4-common.c (do_test): Add temporary fifo creation.
* nptl/tst-cancel4-common.h (fifoname): New variable.
(fifofd): Likewise.
(cl_fifo): New function.
* nptl/tst-cancel4.c (tf_sigpause): Replace SIGCANCEL usage by
SIGINT.
(tf_open): Add early cancel test.
2016-07-04 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/m68k/Makefile (CFLAGS-mcount.c): Define.

12
nptl/tst-cancel4-common.c
View File

@ -44,6 +44,12 @@ do_test (void)
}
setsockopt (fds[1], SOL_SOCKET, SO_SNDBUF, &val, sizeof(val));
if (mktemp (fifoname) == NULL)
{
printf ("%s: cannot generate temp file name: %m\n", __func__);
exit (1);
}
int result = 0;
size_t cnt;
for (cnt = 0; cnt < ntest_tf; ++cnt)
@ -71,7 +77,7 @@ do_test (void)
int r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: barrier_wait failed\n", __FUNCTION__);
printf ("%s: barrier_wait failed\n", __func__);
result = 1;
continue;
}
@ -169,7 +175,7 @@ do_test (void)
int r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: barrier_wait failed\n", __FUNCTION__);
printf ("%s: barrier_wait failed\n", __func__);
result = 1;
continue;
}
@ -184,7 +190,7 @@ do_test (void)
r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: barrier_wait failed\n", __FUNCTION__);
printf ("%s: barrier_wait failed\n", __func__);
result = 1;
continue;
}

16
nptl/tst-cancel4-common.h
View File

@ -67,6 +67,22 @@ cl (void *arg)
++cl_called;
}
/* Named pipe used to check for blocking open. It should be closed
after the cancellation handling. */
static char fifoname[] = "/tmp/tst-cancel4-fifo-XXXXXX";
static int fifofd;
static void
__attribute__ ((used))
cl_fifo (void *arg)
{
++cl_called;
unlink (fifoname);
close (fifofd);
fifofd = -1;
}
struct cancel_tests
{
const char *name;

44
nptl/tst-cancel4.c
View File

@ -36,8 +36,6 @@
#include <sys/poll.h>
#include <sys/wait.h>
#include "pthreadP.h"
/* Since STREAMS are not supported in the standard Linux kernel and
there we don't advertise STREAMS as supported is no need to test
@ -67,6 +65,7 @@
#include "tst-cancel4-common.h"
#ifndef IPC_ADDVAL
# define IPC_ADDVAL 0
#endif
@ -734,13 +733,7 @@ tf_sigpause (void *arg)
pthread_cleanup_push (cl, NULL);
#ifdef SIGCANCEL
/* Just for fun block the cancellation signal. We need to use
__xpg_sigpause since otherwise we will get the BSD version. */
__xpg_sigpause (SIGCANCEL);
#else
pause ();
#endif
sigpause (sigmask (SIGINT));
pthread_cleanup_pop (0);
@ -1348,27 +1341,34 @@ static void *
tf_open (void *arg)
{
if (arg == NULL)
// XXX If somebody can provide a portable test case in which open()
// blocks we can enable this test to run in both rounds.
abort ();
{
fifofd = mkfifo (fifoname, S_IWUSR | S_IRUSR);
if (fifofd == -1)
{
printf ("%s: mkfifo failed: %m\n", __func__);
exit (1);
}
}
else
{
int r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: barrier_wait failed: %m\n", __func__);
exit (1);
}
}
int r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: barrier_wait failed\n", __FUNCTION__);
printf ("%s: 2nd barrier_wait failed: %m\n", __func__);
exit (1);
}
r = pthread_barrier_wait (&b2);
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
{
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
exit (1);
}
pthread_cleanup_push (cl_fifo, NULL);
pthread_cleanup_push (cl, NULL);
open ("Makefile", O_RDONLY);
open (arg ? "Makefile" : fifoname, O_RDONLY);
pthread_cleanup_pop (0);