diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/pthread_mutexattr_gettype.c | 3 | ||||
| -rw-r--r-- | nptl/tst-pthread-mutexattr.c | 60 |
5 files changed, 72 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2015-02-12 Andreas Schwab <schwab@suse.de> + + [BZ #15790] + * nptl/pthread_mutexattr_gettype.c (pthread_mutexattr_gettype): + Filter out elision flags from value returned in kind. + * nptl/Makefile (tests): Add tst-pthread-mutexattr. + * nptl/tst-pthread-mutexattr.c: New file. + 2015-02-11 Samuel Thibault <samuel.thibault@ens-lyon.org> * abi-tags: Revert ae20c9a: rename back gnu into gnu-gnu. @@ -9,7 +9,7 @@ Version 2.22 * The following bugs are resolved with this release: - 4719, 15467, 17912, 17932, 17944, 17949. + 4719, 15467, 15790, 17912, 17932, 17944, 17949. Version 2.21 diff --git a/nptl/Makefile b/nptl/Makefile index 6ae76bb8d1..89fdc8b9b4 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -256,7 +256,7 @@ tests = tst-typesizes \ tst-exit1 tst-exit2 tst-exit3 \ tst-stdio1 tst-stdio2 \ tst-stack1 tst-stack2 tst-stack3 tst-stack4 tst-pthread-getattr \ - tst-pthread-attr-affinity \ + tst-pthread-attr-affinity tst-pthread-mutexattr \ tst-unload \ tst-dlsym1 \ tst-sysconf \ diff --git a/nptl/pthread_mutexattr_gettype.c b/nptl/pthread_mutexattr_gettype.c index 72419bd4fe..0bf2c82813 100644 --- a/nptl/pthread_mutexattr_gettype.c +++ b/nptl/pthread_mutexattr_gettype.c @@ -28,7 +28,8 @@ pthread_mutexattr_gettype (attr, kind) iattr = (const struct pthread_mutexattr *) attr; - *kind = iattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS; + *kind = (iattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS + & ~PTHREAD_MUTEX_NO_ELISION_NP); return 0; } diff --git a/nptl/tst-pthread-mutexattr.c b/nptl/tst-pthread-mutexattr.c new file mode 100644 index 0000000000..10ebe50031 --- /dev/null +++ b/nptl/tst-pthread-mutexattr.c @@ -0,0 +1,60 @@ +/* Make sure that pthread_mutexattr_gettype returns a valid kind. + + 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 <stdio.h> +#include <string.h> +#include <pthread.h> + +static int +do_test (void) +{ + pthread_mutexattr_t attr; + int kind; + int error; + + error = pthread_mutexattr_init (&attr); + if (error) + { + printf ("pthread_mutexattr_init: %s\n", strerror (error)); + return 1; + } + error = pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_DEFAULT); + if (error) + { + printf ("pthread_mutexattr_settype (1): %s\n", strerror (error)); + return 1; + } + error = pthread_mutexattr_gettype (&attr, &kind); + if (error) + { + printf ("pthread_mutexattr_gettype: %s\n", strerror (error)); + return 1; + } + error = pthread_mutexattr_settype (&attr, kind); + if (error) + { + printf ("pthread_mutexattr_settype (2): %s\n", strerror (error)); + return 1; + } + return 0; +} + + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |