commit 84e84f8bb499f1c37631a35778c7ea4eef27fca9
author Jonathan Peyton <jonathan.l.peyton@intel.com> Tue Jun 06 20:24:41 2017 +0000
committer Jonathan Peyton <jonathan.l.peyton@intel.com> Tue Jun 06 20:24:41 2017 +0000
tree 105f53b3271f56042f489edff3e858b91aedb249
parent 2b5580f57bd1f6bd6385daea479ddd70cfe7b766

Fix static initializers for locks.

Fix static initializers to use the proper unlocked value for the poll
field of the tas and futex locks.

Patch by Terry Wilmarth

Differential Revision: https://reviews.llvm.org/D33794


git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@304828 91177308-0d34-0410-b5e6-96231b3b80d8

runtime/src/kmp_lock.h

diff --git a/runtime/src/kmp_lock.h b/runtime/src/kmp_lock.h
index c24647c..0954393 100644
--- a/runtime/src/kmp_lock.h
+++ b/runtime/src/kmp_lock.h
@@ -122,7 +122,8 @@
 // ----------------------------------------------------------------------------
 
 struct kmp_base_tas_lock {
-  volatile kmp_int32 poll; // 0 => unlocked; locked: (gtid+1) of owning thread
+  // KMP_LOCK_FREE(tas) => unlocked; locked: (gtid+1) of owning thread
+  volatile kmp_int32 poll;
   kmp_int32 depth_locked; // depth locked, for nested locks only
 };
 
@@ -140,7 +141,7 @@
 //    kmp_tas_lock_t xlock = KMP_TAS_LOCK_INITIALIZER( xlock );
 #define KMP_TAS_LOCK_INITIALIZER(lock)                                         \
   {                                                                            \
-    { 0, 0 }                                                                   \
+    { KMP_LOCK_FREE(tas), 0 }                                                  \
   }
 
 extern int __kmp_acquire_tas_lock(kmp_tas_lock_t *lck, kmp_int32 gtid);
@@ -178,7 +179,7 @@
 // ----------------------------------------------------------------------------
 
 struct kmp_base_futex_lock {
-  volatile kmp_int32 poll; // 0 => unlocked
+  volatile kmp_int32 poll; // KMP_LOCK_FREE(futex) => unlocked
   // 2*(gtid+1) of owning thread, 0 if unlocked
   // locked: (gtid+1) of owning thread
   kmp_int32 depth_locked; // depth locked, for nested locks only
@@ -199,7 +200,7 @@
 //    kmp_futex_lock_t xlock = KMP_FUTEX_LOCK_INITIALIZER( xlock );
 #define KMP_FUTEX_LOCK_INITIALIZER(lock)                                       \
   {                                                                            \
-    { 0, 0 }                                                                   \
+    { KMP_LOCK_FREE(futex), 0 }                                                \
   }
 
 extern int __kmp_acquire_futex_lock(kmp_futex_lock_t *lck, kmp_int32 gtid);