diff options
Diffstat (limited to 'openmp/runtime/src/kmp_csupport.c')
| -rw-r--r-- | openmp/runtime/src/kmp_csupport.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/openmp/runtime/src/kmp_csupport.c b/openmp/runtime/src/kmp_csupport.c index e50f14e78ab..f774ac14c00 100644 --- a/openmp/runtime/src/kmp_csupport.c +++ b/openmp/runtime/src/kmp_csupport.c @@ -346,11 +346,6 @@ __kmpc_fork_call(ident_t *loc, kmp_int32 argc, kmpc_micro microtask, ...) va_end( ap ); -#if OMPT_SUPPORT - if (ompt_enabled) { - ompt_frame->reenter_runtime_frame = NULL; - } -#endif } } @@ -434,13 +429,6 @@ __kmpc_fork_teams(ident_t *loc, kmp_int32 argc, kmpc_micro microtask, ...) #endif ); -#if OMPT_SUPPORT - if (ompt_enabled) { - parent_team->t.t_implicit_task_taskdata[tid]. - ompt_task_info.frame.reenter_runtime_frame = NULL; - } -#endif - this_thr->th.th_teams_microtask = NULL; this_thr->th.th_teams_level = 0; *(kmp_int64*)(&this_thr->th.th_teams_size) = 0L; @@ -688,9 +676,9 @@ __kmpc_barrier(ident_t *loc, kmp_int32 global_tid) #if OMPT_SUPPORT && OMPT_TRACE ompt_frame_t * ompt_frame; if (ompt_enabled ) { - ompt_frame = &( __kmp_threads[ global_tid ] -> th.th_team -> - t.t_implicit_task_taskdata[__kmp_tid_from_gtid(global_tid)].ompt_task_info.frame); - ompt_frame->reenter_runtime_frame = __builtin_frame_address(1); + ompt_frame = __ompt_get_task_frame_internal(0); + if ( ompt_frame->reenter_runtime_frame == NULL ) + ompt_frame->reenter_runtime_frame = __builtin_frame_address(1); } #endif __kmp_threads[ global_tid ]->th.th_ident = loc; |
