diff options
| -rw-r--r-- | openmp/runtime/src/kmp_barrier.cpp | 2 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_runtime.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp index db372b59d01..cc125dc2a66 100644 --- a/openmp/runtime/src/kmp_barrier.cpp +++ b/openmp/runtime/src/kmp_barrier.cpp @@ -1623,6 +1623,8 @@ void __kmp_join_barrier(int gtid) { ompt_sync_region_barrier, ompt_scope_begin, my_parallel_data, my_task_data, codeptr); } + if (!KMP_MASTER_TID(ds_tid)) + this_thr->th.ompt_thread_info.task_data = *OMPT_CUR_TASK_DATA(this_thr); #endif this_thr->th.ompt_thread_info.state = omp_state_wait_barrier_implicit; } diff --git a/openmp/runtime/src/kmp_runtime.cpp b/openmp/runtime/src/kmp_runtime.cpp index 10f085447e3..8035e077b39 100644 --- a/openmp/runtime/src/kmp_runtime.cpp +++ b/openmp/runtime/src/kmp_runtime.cpp @@ -5669,7 +5669,6 @@ void *__kmp_launch_thread(kmp_info_t *this_thr) { __ompt_get_task_info_object(0)->frame.exit_frame = NULL; this_thr->th.ompt_thread_info.state = omp_state_overhead; - this_thr->th.ompt_thread_info.task_data = *OMPT_CUR_TASK_DATA(this_thr); } #endif /* join barrier after parallel region */ |
