diff mbox

[3/3] Add adaptive elision to rwlocks v2

Message ID CAMe9rOpSBk0xcKjPNb9odxEUsvDGgqH8z5fSs44GF_1nyXn+5Q@mail.gmail.com
State Committed
Headers show

Commit Message

H.J. Lu June 19, 2014, 10:27 p.m. UTC
On Thu, Jun 19, 2014 at 1:52 PM, Andi Kleen <ak@linux.intel.com> wrote:
>> This is wrong for x32.  We need something like
>
> Ok. Looks good to me. I assume you'll handle it.
>
> -Andi
>
>>
>> diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h
>> b/sysdeps/x86/nptl/bits/pthreadtypes.h
>> index b04c32b..bfb9034 100644
>> --- a/sysdeps/x86/nptl/bits/pthreadtypes.h
>> +++ b/sysdeps/x86/nptl/bits/pthreadtypes.h
>> @@ -185,12 +185,17 @@ typedef union
>>      int __writer;
>>      int __shared;
>>      signed char __rwelision;
>> +#  ifdef __ILP32__
>> +    unsigned char __pad1[3];
>> +#   define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0 }
>> +#  else
>>      unsigned char __pad1[7];
>> +#   define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 }
>> +#  endif
>>      unsigned long int __pad2;
>>      /* FLAGS must stay at this position in the structure to maintain
>>         binary compatibility.  */
>>      unsigned int __flags;
>> -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 }
>>  # define __PTHREAD_RWLOCK_INT_FLAGS_SHARED  1
>>    } __data;
>>  # else
>>
>>
>> H.J.
>

I am checking in this.

Thanks.
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index 841d55e..ec08f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@ 
+2014-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+ * sysdeps/x86/nptl/bits/pthreadtypes.h (pthread_rwlock_t): Use
+ 3 bytes for __pad1 for x32.
+ (__PTHREAD_RWLOCK_ELISION_EXTRA): Likewise.
+
 2014-06-19  Ling Ma  <ling.ml@alibaba-inc.com>
     H.J. Lu  <hongjiu.lu@intel.com>

diff --git a/sysdeps/x86/nptl/bits/pthreadtypes.h
b/sysdeps/x86/nptl/bits/pthreadtypes.h
index b04c32b..7f8076b 100644
--- a/sysdeps/x86/nptl/bits/pthreadtypes.h
+++ b/sysdeps/x86/nptl/bits/pthreadtypes.h
@@ -185,12 +185,17 @@  typedef union
     int __writer;
     int __shared;
     signed char __rwelision;
+#  ifdef  __ILP32__
+    unsigned char __pad1[3];
+#    define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0 }
+#  else
     unsigned char __pad1[7];
+#    define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0, 0, 0, 0, 0 }
+#  endif
     unsigned long int __pad2;
     /* FLAGS must stay at this position in the structure to maintain
        binary compatibility.  */
     unsigned int __flags;
-# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 }
 # define __PTHREAD_RWLOCK_INT_FLAGS_SHARED 1
   } __data;
 # else