This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-478-g6736592
- From: krebbel at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 May 2014 09:15:17 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-478-g6736592
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 673659263d956f45f1ce0c66900fa7f1129db74a (commit)
via f8bdf1f0b623f05a80cb23890f165cb0cf8bd8c3 (commit)
from 15eaf6ffe3e117684a0e7b070c0a8754480d3fa3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=673659263d956f45f1ce0c66900fa7f1129db74a
commit 673659263d956f45f1ce0c66900fa7f1129db74a
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon May 26 11:14:25 2014 +0200
Disable lock elision for PTHREAD_MUTEX_NORMAL.
diff --git a/ChangeLog b/ChangeLog
index e988e2b..823bb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com>
+ * nptl/pthread_mutexattr_settype.c
+ (__pthread_mutexattr_settype):
+ Disable lock elision for PTHREAD_MUTEX_NORMAL.
+
+2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com>
+
* nptl/tst-mutex5 (do_test):
Use #ifndef ENABLE_LOCK_ELISION instead of #ifdef.
diff --git a/nptl/pthread_mutexattr_settype.c b/nptl/pthread_mutexattr_settype.c
index 0e91292..cf648cf 100644
--- a/nptl/pthread_mutexattr_settype.c
+++ b/nptl/pthread_mutexattr_settype.c
@@ -32,7 +32,7 @@ __pthread_mutexattr_settype (attr, kind)
/* Cannot distinguish between DEFAULT and NORMAL. So any settype
call disables elision for now. */
- if (kind == PTHREAD_MUTEX_DEFAULT)
+ if (kind == PTHREAD_MUTEX_NORMAL)
kind |= PTHREAD_MUTEX_NO_ELISION_NP;
iattr = (struct pthread_mutexattr *) attr;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f8bdf1f0b623f05a80cb23890f165cb0cf8bd8c3
commit f8bdf1f0b623f05a80cb23890f165cb0cf8bd8c3
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon May 26 11:12:44 2014 +0200
Fix typo in tst-mutex5 ifndef -> ifdef
diff --git a/ChangeLog b/ChangeLog
index 027464d..e988e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-26 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * nptl/tst-mutex5 (do_test):
+ Use #ifndef ENABLE_LOCK_ELISION instead of #ifdef.
+
2014-05-26 Siddhesh Poyarekar <siddhesh@redhat.com>
* benchtests/README: Document 'init' directive.
diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c
index 14d3025..a829272 100644
--- a/nptl/tst-mutex5.c
+++ b/nptl/tst-mutex5.c
@@ -87,7 +87,7 @@ do_test (void)
}
/* Elided locks do not time out. */
-#ifdef ENABLE_LOCK_ELISION
+#ifndef ENABLE_LOCK_ELISION
if (pthread_mutex_trylock (&m) == 0)
{
puts ("mutex_trylock succeeded");
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +++++++++++
nptl/pthread_mutexattr_settype.c | 2 +-
nptl/tst-mutex5.c | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources