htl: Fix comparing attr with default values

Fortunately we were previously only missing an optimization.

Thanks dcb <dcb314@hotmail.com> for the report

	[BZ #23032]
	* sysdeps/htl/pt-barrier-init.c (pthread_barrier_init): Fix comparing
	attr with __pthread_default_barrierattr.
	* sysdeps/htl/pt-cond-init.c (__pthread_cond_init): Fix comparing
	attr with __pthread_default_condattr.
	* sysdeps/htl/pt-mutex-init.c (_pthread_mutex_init): Fix comparing
	attr with __pthread_default_mutexattr.
	* sysdeps/htl/pt-rwlock-init.c (_pthread_rwlock_init): Fix comparing
	attr with __pthread_default_rwlockattr.

diff --git a/ChangeLog b/ChangeLog
index 411116acbed8e49c2df6fdf915b4315e3e6626aa..e00d691d90041581e1f6c3378699094314ab5db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-12-01  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       [BZ #23032]
+       * sysdeps/htl/pt-barrier-init.c (pthread_barrier_init): Fix comparing
+       attr with __pthread_default_barrierattr.
+       * sysdeps/htl/pt-cond-init.c (__pthread_cond_init): Fix comparing
+       attr with __pthread_default_condattr.
+       * sysdeps/htl/pt-mutex-init.c (_pthread_mutex_init): Fix comparing
+       attr with __pthread_default_mutexattr.
+       * sysdeps/htl/pt-rwlock-init.c (_pthread_rwlock_init): Fix comparing
+       attr with __pthread_default_rwlockattr.
+
 2018-12-01  Kemi Wang  <kemi.wang@intel.com>
 
        * manual/tunables.texi (POSIX Thread Tunables): New node.

diff --git a/sysdeps/htl/pt-barrier-init.c b/sysdeps/htl/pt-barrier-init.c
index 7d46624fbe4db2be507786c4d1fabe438f2f0b01..f94dcca3dcb46bff26284454ed284626d71bc014 100644 (file)
--- a/sysdeps/htl/pt-barrier-init.c
+++ b/sysdeps/htl/pt-barrier-init.c
@@ -36,7 +36,7 @@ pthread_barrier_init (pthread_barrier_t *barrier,
   barrier->__count = count;
 
   if (attr == NULL
-      || memcmp (attr, &__pthread_default_barrierattr, sizeof (*attr) == 0))
+      || memcmp (attr, &__pthread_default_barrierattr, sizeof (*attr)) == 0)
     /* Use the default attributes.  */
     return 0;
 

diff --git a/sysdeps/htl/pt-cond-init.c b/sysdeps/htl/pt-cond-init.c
index 4c112e2789b8cccf1af576fe4ad40a5cd12982fa..4ae8859b82c65db33328c83281c8404f9690f02a 100644 (file)
--- a/sysdeps/htl/pt-cond-init.c
+++ b/sysdeps/htl/pt-cond-init.c
@@ -28,7 +28,7 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t * attr)
   *cond = (pthread_cond_t) __PTHREAD_COND_INITIALIZER;
 
   if (attr == NULL
-      || memcmp (attr, &__pthread_default_condattr, sizeof (*attr) == 0))
+      || memcmp (attr, &__pthread_default_condattr, sizeof (*attr)) == 0)
     /* Use the default attributes.  */
     return 0;
 

diff --git a/sysdeps/htl/pt-mutex-init.c b/sysdeps/htl/pt-mutex-init.c
index 664fd607c1aa22f872e17a93bb0ccd4f4dffb62a..813b976e622c92cf00dae9f6252c9b76890ed9e6 100644 (file)
--- a/sysdeps/htl/pt-mutex-init.c
+++ b/sysdeps/htl/pt-mutex-init.c
@@ -29,7 +29,7 @@ _pthread_mutex_init (pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
   *mutex = (pthread_mutex_t) __PTHREAD_MUTEX_INITIALIZER;
 
   if (attr == NULL
-      || memcmp (attr, &__pthread_default_mutexattr, sizeof (*attr) == 0))
+      || memcmp (attr, &__pthread_default_mutexattr, sizeof (*attr)) == 0)
     /* The default attributes.  */
     return 0;
 

diff --git a/sysdeps/htl/pt-rwlock-init.c b/sysdeps/htl/pt-rwlock-init.c
index 527b0ec62f61d24953970f9457e4334e9c5d977c..41d6df5d38638e7600095965be69be90e7f80fcc 100644 (file)
--- a/sysdeps/htl/pt-rwlock-init.c
+++ b/sysdeps/htl/pt-rwlock-init.c
@@ -27,7 +27,7 @@ _pthread_rwlock_init (pthread_rwlock_t *rwlock,
   *rwlock = (pthread_rwlock_t) __PTHREAD_RWLOCK_INITIALIZER;
 
   if (attr == NULL
-      || memcmp (attr, &__pthread_default_rwlockattr, sizeof (*attr) == 0))
+      || memcmp (attr, &__pthread_default_rwlockattr, sizeof (*attr)) == 0)
     /* Use the default attributes.  */
     return 0;