diff mbox

Filter out PTHREAD_MUTEX_NO_ELISION_NP bit in pthread_mutexattr_gettype

Message ID mvmtx5j73e2.fsf@hawking.suse.de
State Committed
Delegated to: Andreas Schwab
Headers show

Commit Message

Andreas Schwab Aug. 11, 2014, 9:59 a.m. UTC
PTHREAD_MUTEX_NO_ELISION_NP is an internal-only flag which isn't valid
as an input to pthread_mutexattr_settype, thus it should never be
visible to the user.

Andreas.

	[BZ #15790]
	* nptl/pthread_mutexattr_gettype.c (pthread_mutexattr_gettype):
	Filter out PTHREAD_MUTEX_NO_ELISION_NP from value returned in
	kind.
	* nptl/Makefile (tests): Add tst-pthread-mutexattr.
	* nptl/tst-pthread-mutexattr.c: New file.
---
 nptl/Makefile                    |  2 +-
 nptl/pthread_mutexattr_gettype.c |  3 +-
 nptl/tst-pthread-mutexattr.c     | 60 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 nptl/tst-pthread-mutexattr.c

Comments

Roland McGrath Aug. 12, 2014, 4:35 p.m. UTC | #1
Shouldn't that be PTHREAD_MUTEX_ELISION_FLAGS_NP?
Andreas Schwab Aug. 12, 2014, 4:58 p.m. UTC | #2
Roland McGrath <roland@hack.frob.com> writes:

> Shouldn't that be PTHREAD_MUTEX_ELISION_FLAGS_NP?

Wouldn't make a difference, but could be used for future compatibility.

Andreas.
diff mbox

Patch

diff --git a/nptl/Makefile b/nptl/Makefile
index ab3080e..566f0c0 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -257,7 +257,7 @@  tests = tst-typesizes \
 	tst-exit1 tst-exit2 tst-exit3 \
 	tst-stdio1 tst-stdio2 \
 	tst-stack1 tst-stack2 tst-stack3 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 4685da4..02e48ae 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..67a2830
--- /dev/null
+++ b/nptl/tst-pthread-mutexattr.c
@@ -0,0 +1,60 @@ 
+/* Make sure that pthread_mutexattr_gettype returns a valid kind.
+
+   Copyright (C) 2014 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"