This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, ibm/2.11/master, updated. glibc-2.11.1-13-gc29c935
- From: rsa at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 May 2010 02:33:08 -0000
- Subject: GNU C Library master sources branch, ibm/2.11/master, updated. glibc-2.11.1-13-gc29c935
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, ibm/2.11/master has been updated
via c29c935857812826b11ce486ed7ee669f39c1c7d (commit)
from 8f0c277566d806f62ac02015660e3044b70bfc0f (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c29c935857812826b11ce486ed7ee669f39c1c7d
commit c29c935857812826b11ce486ed7ee669f39c1c7d
Author: Luis Machado <luisgpm@br.ibm.com>
Date: Wed Mar 24 14:46:03 2010 -0700
Enable common version of pthread_cond_timedwait to use clock_gettime in VDSO
(cherry pick of commit 7749bf5fe6ac0464db10a3a17a31121517f92530)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 08a55ee..dde74f4 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-23 Luis Machado <luisgpm@br.ibm.com>
+
+ * pthread_cond_timedwait.c: Add check for
+ HAVE_CLOCK_GETTIME_VSYSCALL to use VDSO whenever possible.
+ (pthread_cond_timedwait): Use INTERNAL_VSYSCALL instead of
+ INTERNAL_SYSCALL.
+
2009-11-27 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/cancellation.S: Reload
diff --git a/nptl/pthread_cond_timedwait.c b/nptl/pthread_cond_timedwait.c
index 9d268e9..7278ec4 100644
--- a/nptl/pthread_cond_timedwait.c
+++ b/nptl/pthread_cond_timedwait.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2007, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@@ -27,6 +27,14 @@
#include <shlib-compat.h>
+#ifndef HAVE_CLOCK_GETTIME_VSYSCALL
+# undef INTERNAL_VSYSCALL
+# define INTERNAL_VSYSCALL INTERNAL_SYSCALL
+# undef INLINE_VSYSCALL
+# define INLINE_VSYSCALL INLINE_SYSCALL
+#else
+# include <bits/libc-vdso.h>
+#endif
/* Cleanup handler, defined in pthread_cond_wait.c. */
extern void __condvar_cleanup (void *arg)
@@ -102,7 +110,7 @@ __pthread_cond_timedwait (cond, mutex, abstime)
#ifdef __NR_clock_gettime
INTERNAL_SYSCALL_DECL (err);
int ret;
- ret = INTERNAL_SYSCALL (clock_gettime, err, 2,
+ ret = INTERNAL_VSYSCALL (clock_gettime, err, 2,
(cond->__data.__nwaiters
& ((1 << COND_NWAITERS_SHIFT) - 1)),
&rt);
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 7 +++++++
nptl/pthread_cond_timedwait.c | 12 ++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources