[Openmp-commits] [openmp] r347802 - [OpenMP] Rename ompt_mutex_impl_unknown to ompt_mutex_impl_none

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Wed Nov 28 12:19:53 2018
New Revision: 347802

URL: http://llvm.org/viewvc/llvm-project?rev=347802&view=rev
Log:
[OpenMP] Rename ompt_mutex_impl_unknown to ompt_mutex_impl_none

This change renames ompt_mutex_impl_unknown to ompt_mutex_impl_none,
following the name change in the specification.

Patch by Hansang Bae

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

Modified:
    openmp/trunk/runtime/src/include/50/ompt.h.var
    openmp/trunk/runtime/src/kmp_csupport.cpp
    openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp
    openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c

Modified: openmp/trunk/runtime/src/include/50/ompt.h.var
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/include/50/ompt.h.var?rev=347802&r1=347801&r2=347802&view=diff
==============================================================================
--- openmp/trunk/runtime/src/include/50/ompt.h.var (original)
+++ openmp/trunk/runtime/src/include/50/ompt.h.var Wed Nov 28 12:19:53 2018
@@ -96,7 +96,7 @@
 
 
 #define FOREACH_KMP_MUTEX_IMPL(macro)                                                \
-    macro (ompt_mutex_impl_unknown, 0)     /* unknown implementation */              \
+    macro (ompt_mutex_impl_none, 0)        /* unknown implementation */              \
     macro (kmp_mutex_impl_spin, 1)         /* based on spin */                       \
     macro (kmp_mutex_impl_queuing, 2)      /* based on some fair policy */           \
     macro (kmp_mutex_impl_speculative, 3)  /* based on HW-supported speculation */

Modified: openmp/trunk/runtime/src/kmp_csupport.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_csupport.cpp?rev=347802&r1=347801&r2=347802&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_csupport.cpp (original)
+++ openmp/trunk/runtime/src/kmp_csupport.cpp Wed Nov 28 12:19:53 2018
@@ -1292,7 +1292,7 @@ __ompt_get_mutex_impl_type(void *user_lo
       return kmp_mutex_impl_speculative;
 #endif
     default:
-      return ompt_mutex_impl_unknown;
+      return ompt_mutex_impl_none;
     }
     ilock = KMP_LOOKUP_I_LOCK(user_lock);
   }
@@ -1316,7 +1316,7 @@ __ompt_get_mutex_impl_type(void *user_lo
   case locktag_nested_drdpa:
     return kmp_mutex_impl_queuing;
   default:
-    return ompt_mutex_impl_unknown;
+    return ompt_mutex_impl_none;
   }
 }
 #else
@@ -1339,7 +1339,7 @@ static kmp_mutex_impl_t __ompt_get_mutex
     return kmp_mutex_impl_speculative;
 #endif
   default:
-    return ompt_mutex_impl_unknown;
+    return ompt_mutex_impl_none;
   }
 }
 #endif // KMP_USE_DYNAMIC_LOCK

Modified: openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp?rev=347802&r1=347801&r2=347802&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp (original)
+++ openmp/trunk/runtime/test/ompt/misc/api_calls_from_other_thread.cpp Wed Nov 28 12:19:53 2018
@@ -36,7 +36,7 @@ void f() {
   printf("%" PRIu64 ": ompt_enumerate_states()=%d\n", tvalue,
          ompt_enumerate_states(state, &state, &state_name));
 
-  int impl = ompt_mutex_impl_unknown;
+  int impl = ompt_mutex_impl_none;
   const char *impl_name;
   printf("%" PRIu64 ": ompt_enumerate_mutex_impls()=%d\n", tvalue,
          ompt_enumerate_mutex_impls(impl, &impl, &impl_name));

Modified: openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c?rev=347802&r1=347801&r2=347802&view=diff
==============================================================================
--- openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c (original)
+++ openmp/trunk/runtime/test/ompt/misc/api_calls_misc.c Wed Nov 28 12:19:53 2018
@@ -35,7 +35,7 @@ int main() {
     }
 
     // ompt_enumerate_mutex_impls()
-    int impl = ompt_mutex_impl_unknown;
+    int impl = ompt_mutex_impl_none;
     const char *impl_name;
     steps = 0;
     while (ompt_enumerate_mutex_impls(impl, &impl, &impl_name) &&