From 4828151635b421159df7dcc60bbfd0b0fb17aaf4 Mon Sep 17 00:00:00 2001 From: Jonathan Peyton Date: Wed, 1 Jul 2015 15:16:04 +0000 Subject: [PATCH] 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 llvm-svn: 241167 --- openmp/runtime/src/kmp_barrier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp index 7d40fd285d856..ea345b0a9adde 100644 --- a/openmp/runtime/src/kmp_barrier.cpp +++ b/openmp/runtime/src/kmp_barrier.cpp @@ -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)) {