[Openmp-commits] [openmp] r241167 - Fix OMPT event_barrer_end

[Jonathan Peyton]

Author: jlpeyton
Date: Wed Jul  1 10:16:04 2015
New Revision: 241167

URL: http://llvm.org/viewvc/llvm-project?rev=241167&view=rev
Log:
Fix OMPT event_barrer_end

The OMPT status is never equal to ompt_status_track. ompt_status_track = 0x2 
and ompt_status_track_callback = 0x6 just share a bit, so that we can check 
for traceing and callbacks with the same status.

Patch by Tim Cramer

Differential Revision: http://reviews.llvm.org/D10863

Modified:
    openmp/trunk/runtime/src/kmp_barrier.cpp

Modified: openmp/trunk/runtime/src/kmp_barrier.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_barrier.cpp?rev=241167&r1=241166&r2=241167&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_barrier.cpp (original)
+++ openmp/trunk/runtime/src/kmp_barrier.cpp Wed Jul  1 10:16:04 2015
@@ -1502,7 +1502,7 @@ __kmp_join_barrier(int gtid)
     KA_TRACE(10, ("__kmp_join_barrier: T#%d(%d:%d) leaving\n", gtid, team_id, tid));
 
 #if OMPT_SUPPORT
-    if (ompt_status == ompt_status_track) {
+    if (ompt_status & ompt_status_track) {
 #if OMPT_TRACE
         if ((ompt_status == ompt_status_track_callback) &&
             ompt_callbacks.ompt_callback(ompt_event_barrier_end)) {