Merge branch 'fix/memoryLeaks' into develop

Fix memory leaks detected in OpDiLib tests.

Author: jblueh

include/opdi/backend/macro/macros.hpp

@@ -79,16 +79,17 @@
 #define OPDI_SINGLE_NOWAIT(...) \
   { \
     bool constexpr opdiInternalBarrierIndicator = false; \
-    void* opdiInternalTapePosition = opdi::tool->allocPosition(); \
-    opdi::tool->getTapePosition(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition); \
+    void* opdiInternalTapePosition1 = opdi::tool->allocPosition(); \
+    void* opdiInternalTapePosition2 = opdi::tool->allocPosition(); /* for consistency with the end macro */ \
+    opdi::tool->getTapePosition(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition1); \
     opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
                               opdi::LogicInterface::ScopeEndpoint::Begin); \
     opdi::ImplicitBarrierTools::beginRegionWithImplicitBarrier(); \
     { \
       opdi::SingleProbe localSingleProbe; \
       OPDI_PRAGMA(omp single nowait __VA_ARGS__) \
       { \
-        opdi::tool->reset(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition);
+        opdi::tool->reset(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition1);
 
 #define OPDI_END_SINGLE \
         opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
@@ -97,6 +98,8 @@
       opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
                                 opdi::LogicInterface::ScopeEndpoint::End); \
     } \
+    opdi::tool->freePosition(opdiInternalTapePosition1); \
+    opdi::tool->freePosition(opdiInternalTapePosition2); \
     opdi::ImplicitBarrierTools::implicitBarrierStack.top() = opdiInternalBarrierIndicator; \
     opdi::ImplicitBarrierTools::endRegionWithImplicitBarrier(); \
   }

include/opdi/misc/tapePool.hpp

@@ -51,6 +51,7 @@ namespace opdi {
       }
 
       void finalize() {
+        this->clear();
         omp_destroy_lock(&this->lock);
       }
 

tests/tests/TestExternalFunctionGlobal.hpp

@@ -112,6 +112,12 @@ struct TestExternalFunctionGlobal : public TestBase<4, 1, 3, TestExternalFunctio
         for (int i = start; i < end; ++i) {
           jobResults[i] = cos(exp(intermediate[i]));
         }
+
+        OPDI_MASTER()
+        {
+          delete eh;
+        }
+        OPDI_END_MASTER
       }
       OPDI_END_PARALLEL
 
@@ -120,5 +126,6 @@ struct TestExternalFunctionGlobal : public TestBase<4, 1, 3, TestExternalFunctio
       }
 
       delete [] jobResults;
+      delete [] intermediate;
     }
 };

tests/tests/TestExternalFunctionLocal.hpp

@@ -83,6 +83,8 @@ struct TestExternalFunctionLocal : public TestBase<4, 1, 3, TestExternalFunction
         for (int i = start; i < end; ++i) {
           jobResults[i] = cos(exp(intermediate[i]));
         }
+
+        delete eh;
       }
       OPDI_END_PARALLEL
 
@@ -91,5 +93,6 @@ struct TestExternalFunctionLocal : public TestBase<4, 1, 3, TestExternalFunction
       }
 
       delete [] jobResults;
+      delete [] intermediate;
     }
 };