[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r23554 - in /fsf/trunk/libc: nptl/ nptl/sysdeps/unix/sysv/linux/x86/ nptl/sysdeps/unix/sysv/linux/x86/bits/ ports/ ports/sys...



Author: eglibc
Date: Sat Jul 20 00:02:00 2013
New Revision: 23554

Log:
Import glibc-mainline for 2013-07-20

Modified:
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/pthread_mutex_lock.c
    fsf/trunk/libc/nptl/pthread_mutex_trylock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/hle.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c
    fsf/trunk/libc/ports/ChangeLog.tile
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Sat Jul 20 00:02:00 2013
@@ -1,3 +1,26 @@
+2013-07-19  Dominik Vogt  <vogt@xxxxxxxxxx>
+
+	* pthread_mutex_lock.c: Fix whitespace.
+	* pthread_mutex_trylock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/elision-conf.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/elision-conf.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/elision-lock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/elision-timed.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/elision-trylock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/force-elision.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/hle.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c: Likewise.
+	* sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c: Likewise.
+
+	* sysdeps/unix/sysv/linux/x86/elision-conf.c:
+	Remove __rwlock_rtm_enabled and __rwlock_rtm_read_retries.
+	(elision_init): Don't set __rwlock_rtm_enabled.
+	* sysdeps/unix/sysv/linux/x86/elision-conf.h:
+	Remove __rwlock_rtm_enabled.
+
 2013-07-03  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86/init-arch.c: New file.

Modified: fsf/trunk/libc/nptl/pthread_mutex_lock.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_mutex_lock.c (original)
+++ fsf/trunk/libc/nptl/pthread_mutex_lock.c Sat Jul 20 00:02:00 2013
@@ -86,7 +86,7 @@
       /* This case can never happen on a system without elision,
          as the mutex type initialization functions will not
 	 allow to set the elision flags.  */
-      /* Don't record owner or users for elision case. This is a
+      /* Don't record owner or users for elision case.  This is a
          tail call.  */
       return LLL_MUTEX_LOCK_ELISION (mutex);
     }

Modified: fsf/trunk/libc/nptl/pthread_mutex_trylock.c
==============================================================================
--- fsf/trunk/libc/nptl/pthread_mutex_trylock.c (original)
+++ fsf/trunk/libc/nptl/pthread_mutex_trylock.c Sat Jul 20 00:02:00 2013
@@ -31,7 +31,7 @@
 #endif
 
 /* We don't force elision in trylock, because this can lead to inconsistent
-   lock state if the lock was actually busy. */
+   lock state if the lock was actually busy.  */
 
 int
 __pthread_mutex_trylock (mutex)
@@ -73,7 +73,7 @@
       if (lll_trylock_elision (mutex->__data.__lock,
 			       mutex->__data.__elision) != 0)
         break;
-      /* Don't record the ownership. */
+      /* Don't record the ownership.  */
       return 0;
 
     case PTHREAD_MUTEX_TIMED_NP:

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/bits/pthreadtypes.h Sat Jul 20 00:02:00 2013
@@ -112,7 +112,7 @@
     {
       struct
       {
-        short __espins;
+	short __espins;
 	short __elision;
 # define __spins d.__espins
 # define __elision d.__elision

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #include <pthreadP.h>
@@ -32,7 +32,7 @@
        acquisition attempts.  */
     .skip_lock_busy = 3,
     /* How often to not attempt to use elision if a transaction aborted due
-       to reasons other than other threads' memory accesses. Expressed in
+       to reasons other than other threads' memory accesses.  Expressed in
        number of lock acquisition attempts.  */
     .skip_lock_internal_abort = 3,
     /* How often we retry using elision if there is chance for the transaction
@@ -43,22 +43,14 @@
     .skip_trylock_internal_abort = 3,
   };
 
-/* Elided rwlock toggle, set when elision is available and is
-   enabled for rwlocks.  */
-
-int __rwlock_rtm_enabled attribute_hidden;
-
-/* Retries for elided rwlocks on read. Conservative initial value.  */
-
-int __rwlock_rtm_read_retries attribute_hidden = 3;
-
-/* Set when the CPU supports elision. When false elision is never attempted.  */
+/* Set when the CPU supports elision.  When false elision is never attempted.
+ */
 
 int __elision_available attribute_hidden;
 
-/* Force elision for all new locks. This is used to decide whether existing
+/* Force elision for all new locks.  This is used to decide whether existing
    DEFAULT locks should be automatically upgraded to elision in
-   pthread_mutex_lock(). Disabled for suid programs. Only used when elision
+   pthread_mutex_lock().  Disabled for suid programs.  Only used when elision
    is available.  */
 
 int __pthread_force_elision attribute_hidden;
@@ -73,7 +65,6 @@
   __elision_available = HAS_RTM;
 #ifdef ENABLE_LOCK_ELISION
   __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
-  __rwlock_rtm_enabled = __libc_enable_secure ? 0 : __elision_available;
 #endif
 }
 

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 #ifndef _ELISION_CONF_H
 #define _ELISION_CONF_H 1
 
@@ -34,7 +34,6 @@
 
 extern struct elision_config __elision_aconf attribute_hidden;
 
-extern int __rwlock_rtm_enabled attribute_hidden;
 extern int __elision_available attribute_hidden;
 extern int __pthread_force_elision attribute_hidden;
 

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-lock.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include "pthreadP.h"
@@ -58,7 +58,7 @@
 	      if (*futex == 0)
 		return 0;
 
-	      /* Lock was busy. Fall back to normal locking.
+	      /* Lock was busy.  Fall back to normal locking.
 		 Could also _xend here but xabort with 0xff code
 		 is more visible in the profiler.  */
 	      _xabort (_ABORT_LOCK_BUSY);
@@ -69,12 +69,12 @@
 	      if ((status & _XABORT_EXPLICIT)
 			&& _XABORT_CODE (status) == _ABORT_LOCK_BUSY)
 	        {
-		  /* Right now we skip here. Better would be to wait a bit
-		     and retry. This likely needs some spinning.  */
+		  /* Right now we skip here.  Better would be to wait a bit
+		     and retry.  This likely needs some spinning.  */
 		  if (*adapt_count != aconf.skip_lock_busy)
 		    *adapt_count = aconf.skip_lock_busy;
 		}
-	      /* Internal abort. There is no chance for retry.
+	      /* Internal abort.  There is no chance for retry.
 		 Use the normal locking and next time use lock.
 		 Be careful to avoid writing to the lock.  */
 	      else if (*adapt_count != aconf.skip_lock_internal_abort)

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-timed.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 #include <time.h>
 #include <elision-conf.h>

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/elision-trylock.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
 #include <pthreadP.h>
@@ -24,14 +24,14 @@
 
 #define aconf __elision_aconf
 
-/* Try to elide a futex trylock. FUTEX is the futex variable. ADAPT_COUNT is the
-   adaptation counter in the mutex.  */
+/* Try to elide a futex trylock.  FUTEX is the futex variable.  ADAPT_COUNT is
+   the adaptation counter in the mutex.  */
 
 int
 __lll_trylock_elision (int *futex, short *adapt_count)
 {
   /* Implement POSIX semantics by forbiding nesting
-     trylock. Sorry. After the abort the code is re-executed
+     trylock.  Sorry.  After the abort the code is re-executed
      non transactional and if the lock was already locked
      return an error.  */
   _xabort (_ABORT_NESTED_TRYLOCK);
@@ -46,7 +46,7 @@
 	  if (*futex == 0)
 	    return 0;
 
-	  /* Lock was busy. Fall back to normal locking.
+	  /* Lock was busy.  Fall back to normal locking.
 	     Could also _xend here but xabort with 0xff code
 	     is more visible in the profiler.  */
 	  _xabort (_ABORT_LOCK_BUSY);
@@ -54,12 +54,12 @@
 
       if (!(status & _XABORT_RETRY))
         {
-          /* Internal abort. No chance for retry. For future
+          /* Internal abort.  No chance for retry.  For future
              locks don't try speculation for some time.  */
           if (*adapt_count != aconf.skip_trylock_internal_abort)
             *adapt_count = aconf.skip_trylock_internal_abort;
         }
-      /* Could do some retries here. */
+      /* Could do some retries here.  */
     }
   else
     {

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/force-elision.h Sat Jul 20 00:02:00 2013
@@ -14,7 +14,7 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 /* Check for elision on this lock without upgrading.  */
 #define DO_ELISION(m)							\

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/hle.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/hle.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/hle.h Sat Jul 20 00:02:00 2013
@@ -1,5 +1,5 @@
-/* Shared RTM header. Emulate TSX intrinsics for compilers and assemblers
-   that do not support the intrinsics and instructions yet. */
+/* Shared RTM header.  Emulate TSX intrinsics for compilers and assemblers
+   that do not support the intrinsics and instructions yet.  */
 #ifndef _HLE_H
 #define _HLE_H 1
 
@@ -28,7 +28,7 @@
 /* Official RTM intrinsics interface matching gcc/icc, but works
    on older gcc compatible compilers and binutils.
    We should somehow detect if the compiler supports it, because
-   it may be able to generate slightly better code. */
+   it may be able to generate slightly better code.  */
 
 #define _XBEGIN_STARTED		(~0u)
 #define _XABORT_EXPLICIT	(1 << 0)

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_cond_lock.c Sat Jul 20 00:02:00 2013
@@ -13,9 +13,10 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
 
 /* The cond lock is not actually elided yet, but we still need to handle
    already elided locks.  */
 #include <elision-conf.h>
+
 #include "sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c"

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_lock.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,8 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
+
 #include <elision-conf.h>
 #include "force-elision.h"
 

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_timedlock.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,9 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
+
 #include <elision-conf.h>
 #include "force-elision.h"
+
 #include "nptl/pthread_mutex_timedlock.c"

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/x86/pthread_mutex_trylock.c Sat Jul 20 00:02:00 2013
@@ -14,7 +14,8 @@
 
    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/>. */
+   <http://www.gnu.org/licenses/>.  */
+
 #include <elision-conf.h>
 #include "force-elision.h"
 

Modified: fsf/trunk/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.tile (original)
+++ fsf/trunk/libc/ports/ChangeLog.tile Sat Jul 20 00:02:00 2013
@@ -1,3 +1,8 @@
+2013-07-19  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tile/sys/ptrace.h
+	(__ptrace_peeksiginfo_args): Add missing semicolon.
+
 2013-07-03  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/dl-static.c: New file to support

Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/tile/sys/ptrace.h Sat Jul 20 00:02:00 2013
@@ -165,7 +165,7 @@
 {
   /* Read signals from a shared (process wide) queue.  */
   PTRACE_PEEKSIGINFO_SHARED = (1 << 0)
-}
+};
 
 /* Perform process tracing functions.  REQUEST is one of the values
    above, and determines the action to be taken.

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits