Added initial synchronization code

Author: Christoph Hansknecht

ADOL-C/src/tape_handling.cpp

@@ -18,6 +18,8 @@
 #include <adolc/revolve.h>
 #include <adolc/adalloc.h>
 
+#include <mutex>
+
 #ifdef ADOLC_MEDIPACK_SUPPORT
 #include "medipacksupport_p.h"
 #endif
@@ -341,10 +343,21 @@ vector<TapeInfos *> ADOLC_TAPE_INFOS_BUFFER_DECL;
 stack<TapeInfos *> ADOLC_TAPE_STACK_DECL;
 
 /* the main tape info buffer and its fallback */
+#if defined(_OPENMP)
+
 TapeInfos ADOLC_CURRENT_TAPE_INFOS_DECL;
 TapeInfos ADOLC_CURRENT_TAPE_INFOS_FALLBACK_DECL;
 
-/* global taping variables */
+#else
+
+std::mutex tape_mutex;
+
+thread_local TapeInfos ADOLC_CURRENT_TAPE_INFOS_DECL;
+thread_local TapeInfos ADOLC_CURRENT_TAPE_INFOS_FALLBACK_DECL;
+
+#endif
+
+/* global tapeing variables */
 GlobalTapeVars ADOLC_GLOBAL_TAPE_VARS_DECL;
 
 #if defined(_OPENMP)
@@ -419,6 +432,10 @@ int initNewTape(short tapeID) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     /* check if tape is in use */
     vector<TapeInfos *>::iterator tiIter;
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
@@ -537,6 +554,10 @@ void openTape(short tapeID, char mode) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     /* check if tape information exist in memory */
     vector<TapeInfos *>::iterator tiIter;
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
@@ -617,6 +638,10 @@ void releaseTape() {
         ADOLC_CURRENT_TAPE_INFOS.inUse = 0;
     }
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     ADOLC_GLOBAL_TAPE_VARS.currentTapeInfosPtr->copy(
             ADOLC_CURRENT_TAPE_INFOS);
     ADOLC_GLOBAL_TAPE_VARS.currentTapeInfosPtr = ADOLC_TAPE_STACK.top();
@@ -636,6 +661,10 @@ TapeInfos *getTapeInfos(short tapeID) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     /* check if TapeInfos for tapeID exist */
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
         for (tiIter=ADOLC_TAPE_INFOS_BUFFER.begin();
@@ -680,6 +709,10 @@ void cachedTraceTags(std::vector<short>& result) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     result.resize(ADOLC_TAPE_INFOS_BUFFER.size());
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
         for(tiIter=ADOLC_TAPE_INFOS_BUFFER.begin(), tIdIter=result.begin();
@@ -699,6 +732,10 @@ void setTapeInfoJacSparse(short tapeID, SparseJacInfos sJinfos) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     /* check if TapeInfos for tapeID exist */
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
         for (tiIter=ADOLC_TAPE_INFOS_BUFFER.begin();
@@ -740,6 +777,10 @@ void setTapeInfoHessSparse(short tapeID, SparseHessInfos sHinfos) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     /* check if TapeInfos for tapeID exist */
     if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
         for (tiIter=ADOLC_TAPE_INFOS_BUFFER.begin();
@@ -830,6 +871,10 @@ void cleanUp() {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
+#if !defined(_OPENMP)
+    std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
     TapeInfos** tiIter;
     clearCurrentTape();
     while (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
@@ -981,20 +1026,29 @@ int removeTape(short tapeID, short type) {
     ADOLC_OPENMP_THREAD_NUMBER;
     ADOLC_OPENMP_GET_THREAD_NUMBER;
 
-    /* check if TapeInfos for tapeID exist */
-    if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
+#if !defined(_OPENMP)
+    {
+      std::lock_guard<std::mutex> tape_lock(tape_mutex);
+#endif
+
+      /* check if TapeInfos for tapeID exist */
+      if (!ADOLC_TAPE_INFOS_BUFFER.empty()) {
         for (tiIter = ADOLC_TAPE_INFOS_BUFFER.begin();
-                tiIter != ADOLC_TAPE_INFOS_BUFFER.end();
-                ++tiIter)
+             tiIter != ADOLC_TAPE_INFOS_BUFFER.end();
+             ++tiIter)
         {
-            if ((*tiIter)->tapeID == tapeID) {
-                tapeInfos = *tiIter;
-                if (tapeInfos->tapingComplete == 0) return -1;
-                ADOLC_TAPE_INFOS_BUFFER.erase(tiIter);
-                break;
-            }
+          if ((*tiIter)->tapeID == tapeID) {
+            tapeInfos = *tiIter;
+            if (tapeInfos->tapingComplete == 0) return -1;
+            ADOLC_TAPE_INFOS_BUFFER.erase(tiIter);
+            break;
+          }
         }
+      }
+
+#if !defined(_OPENMP)
     }
+#endif
 
     if (tapeInfos == NULL) { // might be on disk only
         tapeInfos = new TapeInfos(tapeID);

ADOL-C/src/taping_p.h

@@ -16,6 +16,8 @@
 
 #ifdef __cplusplus
 #include "storemanager.h"
+#else
+#include <threads.h>
 #endif
 #include <adolc/internal/common.h>
 #include <adolc/taping.h>
@@ -378,6 +380,10 @@ extern int isParallel();
 #define ADOLC_CHECKPOINTS_STACK ADOLC_checkpointsStack[ADOLC_threadNumber]
 #define REVOLVE_NUMBERS revolve_numbers[ADOLC_threadNumber]
 
+extern TapeInfos ADOLC_CURRENT_TAPE_INFOS_DECL;
+extern TapeInfos ADOLC_CURRENT_TAPE_INFOS_FALLBACK_DECL;
+extern GlobalTapeVars ADOLC_GLOBAL_TAPE_VARS_DECL;
+
 #else
 
 #define ADOLC_TAPE_INFOS_BUFFER_DECL tapeInfosBuffer
@@ -401,12 +407,12 @@ extern int isParallel();
 #define ADOLC_CHECKPOINTS_STACK ADOLC_checkpointsStack
 #define REVOLVE_NUMBERS revolve_numbers
 
-#endif /* _OPENMP */
-
-extern TapeInfos ADOLC_CURRENT_TAPE_INFOS_DECL;
-extern TapeInfos ADOLC_CURRENT_TAPE_INFOS_FALLBACK_DECL;
+extern thread_local TapeInfos ADOLC_CURRENT_TAPE_INFOS_DECL;
+extern thread_local TapeInfos ADOLC_CURRENT_TAPE_INFOS_FALLBACK_DECL;
 extern GlobalTapeVars ADOLC_GLOBAL_TAPE_VARS_DECL;
 
+#endif /* _OPENMP */
+
 /****************************************************************************/
 /* C Function interfaces                                                    */
 /****************************************************************************/