diff options
| author | Joachim Protze <protze@itc.rwth-aachen.de> | 2018-12-18 08:52:30 +0000 |
|---|---|---|
| committer | Joachim Protze <protze@itc.rwth-aachen.de> | 2018-12-18 08:52:30 +0000 |
| commit | b59b5f3e3c1d46443796bdbbb1b5c9630f37936a (patch) | |
| tree | 994ec64fa177806ca8cf45377598c1758e6cb6d5 /openmp/runtime/src/kmp_lock.cpp | |
| parent | 103ab7f8578538ff6e5916dc1dc63071eec9a706 (diff) | |
[OMPT] First chunk of final OMPT 5.0 interface updates
This patch updates the implementation of the ompt_frame_t, ompt_wait_id_t
and ompt_state_t. The final version of the OpenMP 5.0 spec added the "t"
for these types.
Furthermore the structure for ompt_frame_t changed and allows to specify
that the reenter frame belongs to the runtime.
Patch partially prepared by Simon Convent
Reviewers: hbae
Diffstat (limited to 'openmp/runtime/src/kmp_lock.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_lock.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp index c51640bfba3..5c2eeed9b8c 100644 --- a/openmp/runtime/src/kmp_lock.cpp +++ b/openmp/runtime/src/kmp_lock.cpp @@ -1108,7 +1108,7 @@ __kmp_acquire_queuing_lock_timed_template(kmp_queuing_lock_t *lck, kmp_int32 need_mf = 1; #if OMPT_SUPPORT - omp_state_t prev_state = omp_state_undefined; + ompt_state_t prev_state = ompt_state_undefined; #endif KA_TRACE(1000, @@ -1216,7 +1216,7 @@ __kmp_acquire_queuing_lock_timed_template(kmp_queuing_lock_t *lck, #endif #if OMPT_SUPPORT - if (ompt_enabled.enabled && prev_state != omp_state_undefined) { + if (ompt_enabled.enabled && prev_state != ompt_state_undefined) { /* change the state before clearing wait_id */ this_thr->th.ompt_thread_info.state = prev_state; this_thr->th.ompt_thread_info.wait_id = 0; @@ -1231,11 +1231,11 @@ __kmp_acquire_queuing_lock_timed_template(kmp_queuing_lock_t *lck, } #if OMPT_SUPPORT - if (ompt_enabled.enabled && prev_state == omp_state_undefined) { + if (ompt_enabled.enabled && prev_state == ompt_state_undefined) { /* this thread will spin; set wait_id before entering wait state */ prev_state = this_thr->th.ompt_thread_info.state; this_thr->th.ompt_thread_info.wait_id = (uint64_t)lck; - this_thr->th.ompt_thread_info.state = omp_state_wait_lock; + this_thr->th.ompt_thread_info.state = ompt_state_wait_lock; } #endif |