diff mbox

[v2] nptl: Add NPTL cases for cancellation failures cases

Message ID 1444412895-18665-1-git-send-email-adhemerval.zanella@linaro.com
State New
Headers show

Commit Message

Adhemerval Zanella Netto Oct. 9, 2015, 5:48 p.m. UTC 
Changes from v1:

- Added descriptive comment in header.
- Use C99 inline declaration.
- Remove errno save in local variable.
- Remove duplicate code.

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/Makefile (tests): Add tst-cancel26.c and tst-cancel27.c.
	* nptl/tst-cancel26.c: New file.
	* nptl/tst-cancel27.c: Likewise.

---
 ChangeLog           |  7 ++++++
 nptl/Makefile       |  1 +
 nptl/tst-cancel26.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 nptl/tst-cancel27.c | 23 ++++++++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 nptl/tst-cancel26.c
 create mode 100644 nptl/tst-cancel27.c

Comments

Roland McGrath Oct. 9, 2015, 6:31 p.m. UTC | #1 
Looks fine.
Phil Blundell Oct. 9, 2015, 6:38 p.m. UTC | #2 
On Fri, 2015-10-09 at 14:48 -0300, Adhemerval Zanella wrote:
>  2015-10-09  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
> +	    Phil Blundell <pb@pbcui.dot.net>

Something seems to have gone a bit wrong with my email address there.

p.
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 025a3d8..0ad682a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@ 
 2015-10-09  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+	    Phil Blundell <pb@pbcui.dot.net>
+
+	* nptl/Makefile (tests): Add tst-cancel26.c and tst-cancel27.c.
+	* nptl/tst-cancel26.c: New file.
+	* nptl/tst-cancel27.c: Likewise.
+
+2015-10-09  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/Makefile b/nptl/Makefile
index f3de49b..311b1a7 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -259,6 +259,7 @@  tests = tst-typesizes \
 	tst-cancel11 tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 \
 	tst-cancel16 tst-cancel17 tst-cancel18 tst-cancel19 tst-cancel20 \
 	tst-cancel21 tst-cancel22 tst-cancel23 tst-cancel24 tst-cancel25 \
+	tst-cancel26 tst-cancel27 \
 	tst-cancel-self tst-cancel-self-cancelstate \
 	tst-cancel-self-canceltype tst-cancel-self-testcancel \
 	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 tst-cleanup4 \
diff --git a/nptl/tst-cancel26.c b/nptl/tst-cancel26.c
new file mode 100644
index 0000000..3c0a591
--- /dev/null
+++ b/nptl/tst-cancel26.c
@@ -0,0 +1,68 @@ 
+/* Check for failure paths handling for cancellation points.
+   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>
+
+/* Check that the cancel syscall points handles both the errno and return code
+   correctly for invalid arguments.  */
+static void *
+tf (void *arg)
+{
+#ifdef SET_CANCEL_DISABLE
+  pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);
+#endif
+
+  /* This is a cancellation point, but we should not be cancelled.  */
+  int r = write (-1, 0, 0);
+
+  if (r != -1 || errno != EBADF)
+    {
+      printf ("error: write returned %d, errno %d\n", r, errno);
+      exit (1);
+    }
+
+  return NULL;
+}
+
+static int
+do_test (void)
+{
+  pthread_t th;
+
+  if (pthread_create (&th, NULL, tf, NULL) != 0)
+    {
+      puts ("error: pthread_create failed");
+      exit (1);
+    }
+
+  if (pthread_join (th, NULL) != 0)
+    {
+      puts ("error: pthread_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..3264aea
--- /dev/null
+++ b/nptl/tst-cancel27.c
@@ -0,0 +1,23 @@ 
+/* Check for failure paths handling for cancellation points.
+   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/>.  */
+
+/* Similar to tst-cancel26.c but with pthread cancel state set to
+   PTHREAD_CANCEL_DISABLE.  */
+
+#define SET_CANCEL_DISABLE 1
+#include "tst-cancel26.c"