diff options
Diffstat (limited to 'openmp/runtime/src/kmp_tasking.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_tasking.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_tasking.cpp b/openmp/runtime/src/kmp_tasking.cpp index e1b03f780b5..9028686bea1 100644 --- a/openmp/runtime/src/kmp_tasking.cpp +++ b/openmp/runtime/src/kmp_tasking.cpp @@ -473,7 +473,7 @@ static inline void __ompt_task_start(kmp_task_t *task, kmp_taskdata_t *current_task, kmp_int32 gtid) { kmp_taskdata_t *taskdata = KMP_TASK_TO_TASKDATA(task); - ompt_task_status_t status = ompt_task_others; + ompt_task_status_t status = ompt_task_switch; if (__kmp_threads[gtid]->th.ompt_thread_info.ompt_task_yielded) { status = ompt_task_yield; __kmp_threads[gtid]->th.ompt_thread_info.ompt_task_yielded = 0; @@ -1586,7 +1586,7 @@ kmp_int32 __kmpc_omp_task(ident_t *loc_ref, kmp_int32 gtid, // Scheduling back to the parent task. __ompt_task_finish(new_task, new_taskdata->ompt_task_info.scheduling_parent, - ompt_task_others); + ompt_task_switch); new_taskdata->ompt_task_info.frame.exit_frame = NULL; } } @@ -1766,7 +1766,7 @@ static kmp_int32 __kmpc_omp_taskwait_template(ident_t *loc_ref, kmp_int32 gtid, return TASK_CURRENT_NOT_QUEUED; } -#if OMPT_SUPPORT +#if OMPT_SUPPORT && OMPT_OPTIONAL OMPT_NOINLINE static kmp_int32 __kmpc_omp_taskwait_ompt(ident_t *loc_ref, kmp_int32 gtid, void *frame_address, @@ -1774,7 +1774,7 @@ static kmp_int32 __kmpc_omp_taskwait_ompt(ident_t *loc_ref, kmp_int32 gtid, return __kmpc_omp_taskwait_template<true>(loc_ref, gtid, frame_address, return_address); } -#endif // OMPT_SUPPORT +#endif // OMPT_SUPPORT && OMPT_OPTIONAL // __kmpc_omp_taskwait: Wait until all tasks generated by the current task are // complete |
