From 2868e0703d5b8c8e60c6f60de13e876c4d85daa0 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 11 Aug 2014 11:18:26 +0200 Subject: [PATCH] Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype (BZ #15790) pthread_mutexattr_settype adds PTHREAD_MUTEX_NO_ELISION_NP to kind, which is an internal flag that pthread_mutexattr_gettype shouldn't expose, since pthread_mutexattr_settype wouldn't accept it. --- ChangeLog | 8 ++++++ NEWS | 2 +- nptl/Makefile | 2 +- nptl/pthread_mutexattr_gettype.c | 3 +- nptl/tst-pthread-mutexattr.c | 60 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 nptl/tst-pthread-mutexattr.c diff --git a/ChangeLog b/ChangeLog index bf4ddd0..2941ec1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-02-12 Andreas Schwab + + [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 * abi-tags: Revert ae20c9a: rename back gnu into gnu-gnu. diff --git a/NEWS b/NEWS index 2d4ebb9..2938f6e 100644 --- a/NEWS +++ b/NEWS @@ -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 6ae76bb..89fdc8b 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 72419bd..0bf2c82 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 0000000..10ebe50 --- /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 + . */ + +#include +#include +#include + +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" -- 2.7.4