Make AD treatment and instrumentation consistent w.r.t tape activity.

Merge branch 'revisit/tapeActivity' into develop

Author: jblueh

include/opdi/logic/omp/flushOmpLogic.hpp

@@ -51,9 +51,13 @@ namespace opdi {
     public:
 
       virtual void addReverseFlush() {
-        Handle* handle = new Handle;
-        handle->reverseFunc = FlushOmpLogic::reverseFunc;
-        tool->pushExternalFunction(tool->getThreadLocalTape(), handle);
+
+        if (tool != nullptr && tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
+
+          Handle* handle = new Handle;
+          handle->reverseFunc = FlushOmpLogic::reverseFunc;
+          tool->pushExternalFunction(tool->getThreadLocalTape(), handle);
+        }
       }
   };
 }

include/opdi/logic/omp/masterOmpLogic.cpp

@@ -54,12 +54,12 @@ void opdi::MasterOmpLogic::deleteFunc(void* dataPtr) {
 void opdi::MasterOmpLogic::onMaster(ScopeEndpoint endpoint) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
-    for (auto& instrument : ompLogicInstruments) {
-      instrument->onMaster(endpoint);
-    }
-
     if (tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
 
+        for (auto& instrument : ompLogicInstruments) {
+          instrument->onMaster(endpoint);
+        }
+
         Data* data = new Data;
         data->endpoint = endpoint;
 

include/opdi/logic/omp/syncRegionOmpLogic.cpp

@@ -82,13 +82,14 @@ bool opdi::SyncRegionOmpLogic::requiresReverseBarrier(SyncRegionKind kind, Scope
 
 void opdi::SyncRegionOmpLogic::onSyncRegion(SyncRegionKind kind, ScopeEndpoint endpoint) {
 
-  #if OPDI_OMP_LOGIC_INSTRUMENT
-    for (auto& instrument : ompLogicInstruments) {
-      instrument->onSyncRegion(kind, endpoint);
-    }
-  #endif
-
   if (tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
+
+    #if OPDI_OMP_LOGIC_INSTRUMENT
+        for (auto& instrument : ompLogicInstruments) {
+          instrument->onSyncRegion(kind, endpoint);
+        }
+    #endif
+
     if (requiresReverseBarrier(kind, endpoint)) {
       internalPushHandle(kind, endpoint);
     }