diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:53:14 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:53:14 +0000 |
commit | 53265afff0dd5ba32642c444583e7d2bb25ca2e9 (patch) | |
tree | 62c6dca85a7f7ec8c3adb959c8d512cb140b705a /runtime/src/ompt-general.cpp | |
parent | 1756886afc900127720de68088f9adff3108ef61 (diff) |
Notes
Diffstat (limited to 'runtime/src/ompt-general.cpp')
-rw-r--r-- | runtime/src/ompt-general.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/runtime/src/ompt-general.cpp b/runtime/src/ompt-general.cpp index 00bf606bb1d5..41b2827007b6 100644 --- a/runtime/src/ompt-general.cpp +++ b/runtime/src/ompt-general.cpp @@ -430,10 +430,8 @@ OMPT_API_ROUTINE ompt_set_result_t ompt_set_callback(ompt_callbacks_t which, #define ompt_event_macro(event_name, callback_type, event_id) \ case event_name: \ - if (ompt_event_implementation_status(event_name)) { \ - ompt_callbacks.ompt_callback(event_name) = (callback_type)callback; \ - ompt_enabled.event_name = (callback != 0); \ - } \ + ompt_callbacks.ompt_callback(event_name) = (callback_type)callback; \ + ompt_enabled.event_name = (callback != 0); \ if (callback) \ return ompt_event_implementation_status(event_name); \ else \ @@ -456,16 +454,15 @@ OMPT_API_ROUTINE int ompt_get_callback(ompt_callbacks_t which, switch (which) { #define ompt_event_macro(event_name, callback_type, event_id) \ - case event_name: \ - if (ompt_event_implementation_status(event_name)) { \ - ompt_callback_t mycb = \ - (ompt_callback_t)ompt_callbacks.ompt_callback(event_name); \ - if (ompt_enabled.event_name && mycb) { \ - *callback = mycb; \ - return ompt_get_callback_success; \ - } \ + case event_name: { \ + ompt_callback_t mycb = \ + (ompt_callback_t)ompt_callbacks.ompt_callback(event_name); \ + if (ompt_enabled.event_name && mycb) { \ + *callback = mycb; \ + return ompt_get_callback_success; \ } \ - return ompt_get_callback_failure; + return ompt_get_callback_failure; \ + } FOREACH_OMPT_EVENT(ompt_event_macro) |