Refactoring in the OMPT backend.

MasterCallbacks -> MaskedCallbacks
onMaster -> onMasked
Version-dependent callback registration.

Author: jblueh

…de/opdi/backend/ompt/masterCallbacks.hpp …de/opdi/backend/ompt/maskedCallbacks.hppinclude/opdi/backend/ompt/masterCallbacks.hpp renamed to include/opdi/backend/ompt/maskedCallbacks.hpp include/opdi/backend/ompt/masterCallbacks.hpp renamed to include/opdi/backend/ompt/maskedCallbacks.hpp

@@ -34,11 +34,11 @@
 
 namespace opdi {
 
-  struct MasterCallbacks : public virtual CallbacksBase {
+  struct MaskedCallbacks : public virtual CallbacksBase {
 
     private:
 
-      static void onMaster(ompt_scope_endpoint_t _endpoint,
+      static void onMasked(ompt_scope_endpoint_t _endpoint,
                            ompt_data_t* parallelData,
                            ompt_data_t* taskData,
                            void const* codeptr) {
@@ -60,12 +60,21 @@ namespace opdi {
     protected:
 
       static void init() {
-        OPDI_CHECK_ERROR(CallbacksBase::registerCallback(ompt_callback_master,
-                                                        (ompt_callback_t) MasterCallbacks::onMaster));
+        #if _OPENMP >= 202011
+          OPDI_CHECK_ERROR(CallbacksBase::registerCallback(ompt_callback_masked,
+                                                          (ompt_callback_t) MaskedCallbacks::onMasked));
+        #else
+          OPDI_CHECK_ERROR(CallbacksBase::registerCallback(ompt_callback_master,
+                                                          (ompt_callback_t) MaskedCallbacks::onMasked));
+        #endif
       }
 
       static void finalize() {
-        OPDI_CHECK_ERROR(CallbacksBase::clearCallback(ompt_callback_master));
+        #if _OPENMP >= 202011
+          OPDI_CHECK_ERROR(CallbacksBase::clearCallback(ompt_callback_masked));
+        #else
+          OPDI_CHECK_ERROR(CallbacksBase::clearCallback(ompt_callback_master));
+        #endif
       }
 
   };

include/opdi/backend/ompt/omptBackend.hpp

@@ -44,7 +44,7 @@
 
 #include "implicitTaskCallbacks.hpp"
 #include "macros.hpp"
-#include "masterCallbacks.hpp"
+#include "maskedCallbacks.hpp"
 #include "mutexCallbacks.hpp"
 #include "parallelCallbacks.hpp"
 #include "reductionCallbacks.hpp"
@@ -55,7 +55,7 @@
 namespace opdi {
 
   struct OmptBackend : public ImplicitTaskCallbacks,
-                       public MasterCallbacks,
+                       public MaskedCallbacks,
                        public MutexCallbacks,
                        public ParallelCallbacks,
                        public ReductionCallbacks,
@@ -108,7 +108,7 @@ namespace opdi {
         MutexCallbacks::init();
         ReductionCallbacks::init();
         #if OPDI_BACKEND_GENERATE_MASKED_EVENTS
-          MasterCallbacks::init();
+          MaskedCallbacks::init();
         #endif
 
         return 1; // success
@@ -120,7 +120,7 @@ namespace opdi {
 
         // finalize callback structures
         #if OPDI_BACKEND_GENERATE_MASKED_EVENTS
-          MasterCallbacks::finalize();
+          MaskedCallbacks::finalize();
         #endif
         ReductionCallbacks::finalize();
         MutexCallbacks::finalize();