Proper data deletion for passive parallel regions.

Mechanism to skip the handling of internal parallel regions.

Author: jblueh

include/opdi/logic/omp/parallelOmpLogic.cpp

@@ -32,6 +32,8 @@
 
 #include "parallelOmpLogic.hpp"
 
+int opdi::ParallelOmpLogic::skipParallelHandling = 0;
+
 void opdi::ParallelOmpLogic::reverseFunc(void* dataPtr) {
 
   Data* data = (Data*) dataPtr;
@@ -42,6 +44,8 @@ void opdi::ParallelOmpLogic::reverseFunc(void* dataPtr) {
     }
   #endif
 
+  ++ParallelOmpLogic::skipParallelHandling;
+
   #pragma omp parallel num_threads(data->actualThreads)
   {
     int threadNum = omp_get_thread_num();
@@ -70,6 +74,8 @@ void opdi::ParallelOmpLogic::reverseFunc(void* dataPtr) {
                      data->adjointAccessModes[threadNum][j - 1] == AdjointAccessMode::Atomic);
     }
 
+    --ParallelOmpLogic::skipParallelHandling;
+
     tool->setThreadLocalTape(oldTape);
 
     #if OPDI_OMP_LOGIC_INSTRUMENT
@@ -90,6 +96,8 @@ void opdi::ParallelOmpLogic::deleteFunc(void* dataPtr) {
 
   Data* data = (Data*) dataPtr;
 
+  ++ParallelOmpLogic::skipParallelHandling;
+
   // this triggers possibly pending implicit task end events
   #pragma omp parallel num_threads(data->actualThreads)
   {
@@ -108,13 +116,15 @@ void opdi::ParallelOmpLogic::deleteFunc(void* dataPtr) {
     }
   }
 
+  --ParallelOmpLogic::skipParallelHandling;
+
   delete [] data->tapes;
   delete data;
 }
 
 void* opdi::ParallelOmpLogic::onParallelBegin(int maxThreads) {
 
-  if (tool->getThreadLocalTape() != nullptr) {
+  if (tool->getThreadLocalTape() != nullptr && ParallelOmpLogic::skipParallelHandling == 0) {
 
     Data* data = new Data;
 
@@ -166,8 +176,9 @@ void opdi::ParallelOmpLogic::onParallelEnd(void* dataPtr) {
       tool->pushExternalFunction(data->masterTape, handle);
 
       // do not delete data, it is deleted with the handle
+
     } else {
-      delete data;
+      deleteFunc(data);
     }
   }
   #if OPDI_OMP_LOGIC_INSTRUMENT

include/opdi/logic/omp/parallelOmpLogic.hpp

@@ -57,6 +57,9 @@ namespace opdi {
 
     private:
 
+      static int skipParallelHandling;
+      #pragma omp threadprivate(skipParallelHandling)
+
       static void reverseFunc(void* dataPtr);
       static void deleteFunc(void* dataPtr);