This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 01/13] nptl: Add NPTL cases for cancellation failures cases
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Wed, 7 Oct 2015 13:23:03 -0300
- Subject: [PATCH 01/13] nptl: Add NPTL cases for cancellation failures cases
- Authentication-results: sourceware.org; auth=none
- References: <1444234995-9542-1-git-send-email-adhemerval dot zanella at linaro dot com>
This patch pthread cancellation tests to check for failures cases
wherer the syscall cancel wrapper should both set the error and
the errno values.
Tested on i686, x86_64, x32, powerpc64le, and aarch64.
* nptl/tst-cancel26.c: New file.
* nptl/tst-cancel27.c: Likewise.
---
ChangeLog | 6 +++++
nptl/tst-cancel26.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
nptl/tst-cancel27.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 144 insertions(+)
create mode 100644 nptl/tst-cancel26.c
create mode 100644 nptl/tst-cancel27.c
diff --git a/ChangeLog b/ChangeLog
index e665153..75cd365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
2015-10-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ Phil Blundell <pb@pbcui.dot.net>
+
+ * nptl/tst-cancel26.c: New file.
+ * nptl/tst-cancel27.c: Likewise.
+
+2015-10-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
diff --git a/nptl/tst-cancel26.c b/nptl/tst-cancel26.c
new file mode 100644
index 0000000..9a370d0
--- /dev/null
+++ b/nptl/tst-cancel26.c
@@ -0,0 +1,68 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void *
+tf (void *arg)
+{
+ int e, r;
+
+ errno = 0;
+
+ /* This is a cancellation point, but we should not be cancelled. */
+ r = write (-1, 0, 0);
+ e = errno;
+
+ /* Check that the cancelling syscall wrapper has handled the error correctly. */
+ if (r != -1 || errno != EBADF)
+ {
+ printf ("write returned %d, errno %d\n", r, e);
+ exit (1);
+ }
+
+ return NULL;
+}
+
+static int
+do_test (void)
+{
+ pthread_t th;
+
+ if (pthread_create (&th, NULL, tf, NULL) != 0)
+ {
+ puts ("create failed");
+ exit (1);
+ }
+
+ void *r;
+ if (pthread_join (th, &r) != 0)
+ {
+ puts ("join failed");
+ exit (1);
+ }
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/nptl/tst-cancel27.c b/nptl/tst-cancel27.c
new file mode 100644
index 0000000..aee25c9
--- /dev/null
+++ b/nptl/tst-cancel27.c
@@ -0,0 +1,70 @@
+/* Copyright (C) 2015 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static void *
+tf (void *arg)
+{
+ int e, r;
+
+ errno = 0;
+
+ pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
+
+ /* This is a cancellation point, but we should not be cancelled. */
+ r = write (-1, 0, 0);
+ e = errno;
+
+ /* Check that the cancelling syscall wrapper has handled the error correctly. */
+ if (r != -1 || errno != EBADF)
+ {
+ printf ("write returned %d, errno %d\n", r, e);
+ exit (1);
+ }
+
+ return NULL;
+}
+
+static int
+do_test (void)
+{
+ pthread_t th;
+
+ if (pthread_create (&th, NULL, tf, NULL) != 0)
+ {
+ puts ("create failed");
+ exit (1);
+ }
+
+ void *r;
+ if (pthread_join (th, &r) != 0)
+ {
+ puts ("join failed");
+ exit (1);
+ }
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
--
1.9.1