diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/Makefile | 1 | ||||
| -rw-r--r-- | nptl/tst-cancel26.c | 68 | ||||
| -rw-r--r-- | nptl/tst-cancel27.c | 23 |
4 files changed, 99 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index cf987c6b57..23f6fe9f76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/fpu/s_llrint.S (__lrint): Add alias only if diff --git a/nptl/Makefile b/nptl/Makefile index f3de49bb4d..311b1a78b4 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 0000000000..3c0a5913d5 --- /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 0000000000..e82cbe9510 --- /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" |