Improve thread-safety in DART

CMakeExt/Code/test_builtin_sync.c

@@ -0,0 +1,11 @@
+
+
+int main(int argc, char **argv)
+{
+  int val = 0;
+  int res = __sync_add_and_fetch(&val, 1);
+
+  if (res != 1) return 1;
+
+  return 0;
+}

CMakeExt/Threading.cmake

@@ -1,22 +1,41 @@
-## Flags to enabel support for multi-threading 
+## Flags to enable support for multi-threading 
 
 ##
-# At the moment, ENABLE_THREADING enables DART_THREADING_PTHREADS since
+# At the moment, DART_ENABLE_THREADSUPPORT enables DART_HAVE_PTHREADS since 
 # Pthreads are the only threading implementation currently supported. 
 ##
 
-if (ENABLE_THREADING)
+if (ENABLE_THREADSUPPORT)
 
+    MESSAGE(STATUS "Checking for builtin __sync_add_and_fetch")
+    TRY_COMPILE(DART_SYNC_BUILTINS ${CMAKE_BINARY_DIR}
+                ${CMAKE_SOURCE_DIR}/CMakeExt/Code/test_builtin_sync.c 
+                OUTPUT_VARIABLE OUTPUT)
+    if (DART_SYNC_BUILTINS)
+      MESSAGE(STATUS "Found builtin __sync_add_and_fetch")
+      set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS_RELEASE} -DDART_HAVE_SYNC_BUILTINS")
+      set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS_RELEASE} -DDART_HAVE_SYNC_BUILTINS")
+    else()
+      # error out for now
+      MESSAGE(STATUS "Compiling builtin __sync_add_and_fetch failed with error " 
+                     ${OUTPUT})
+      message(FATAL_ERROR "Support for builtin __sync atomics required if " 
+                          "building with thread support enabled!")
+    endif()
+
     # Find support for pthreads
     find_package(Threads REQUIRED)
-    set(CMAKE_C_FLAGS_RELEASE
-        "${CMAKE_C_FLAGS_RELEASE} -pthread -DDART_ENABLE_THREADING -DDART_THREADING_PTHREADS -DDASH_ENABLE_THREADING")
-    set(CMAKE_CXX_FLAGS_RELEASE
-        "${CMAKE_CXX_FLAGS_RELEASE} -pthread -DDART_ENABLE_THREADING -DDART_THREADING_PTHREADS -DDASH_ENABLE_THREADING")
-    set(CMAKE_C_FLAGS_DEBUG
-        "${CMAKE_C_FLAGS_DEBUG} -pthread -DDART_ENABLE_THREADING -DDART_THREADING_PTHREADS -DDASH_ENABLE_THREADING")
-    set(CMAKE_CXX_FLAGS_DEBUG
-        "${CMAKE_CXX_FLAGS_DEBUG} -pthread -DDART_ENABLE_THREADING -DDART_THREADING_PTHREADS -DDASH_ENABLE_THREADING")
+    set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS} -pthread -DDART_ENABLE_THREADSUPPORT")
+    set(CMAKE_C_FLAGS
+        "${CMAKE_C_FLAGS} -DDART_HAVE_PTHREADS -DDASH_ENABLE_THREADSUPPORT")
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -pthread -DDART_ENABLE_THREADSUPPORT")
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -DDART_HAVE_PTHREADS -DDASH_ENABLE_THREADSUPPORT")
     set(CMAKE_EXE_LINKER_FLAGS
         "${CMAKE_EXE_LINKER_FLAGS} -pthread")
+
 endif()

CMakeLists.txt

@@ -93,7 +93,7 @@ option(ENABLE_HDF5
        "Specify whether HDF5 features are enabled" on)
 option(ENABLE_NASTYMPI
        "Specify whether the NastyMPI proxy should be enabled" off)
-option(ENABLE_THREADING
+option(ENABLE_THREADSUPPORT
        "Specify whether support for multithreading should be compiled" off)
 
 if (BUILD_COVERAGE_TESTS)
@@ -134,7 +134,7 @@ endif()
 if (ENABLE_NASTYMPI)
   include(${CMAKE_SOURCE_DIR}/CMakeExt/NastyMPI.cmake)
 endif()
-if (ENABLE_THREADING)
+if (ENABLE_THREADSUPPORT)
   include(${CMAKE_SOURCE_DIR}/CMakeExt/Threading.cmake)
 endif()
 
@@ -292,8 +292,8 @@ message(INFO "HDF5 support:             (ENABLE_HDF5)                    "
         ${ENABLE_HDF5})
 message(INFO "Enabled DART backends:    (DART_IMPLEMENTATIONS)           "
         ${DART_IMPLEMENTATIONS})
-message(INFO "Enable multithreading:    (ENABLE_MULTITHREADING)          "
-        ${ENABLE_MULTITHREADING})
+message(INFO "Enable multithreading:    (ENABLE_THREADSUPPORT)          "
+        ${ENABLE_THREADSUPPORT})
 message(INFO "C   compiler id:          ${CMAKE_C_COMPILER_ID}")
 message(INFO "C++ compiler id:          ${CMAKE_CXX_COMPILER_ID}")
 if (MPI_FOUND)

build.cov.sh

@@ -59,6 +59,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0/ \
                         -DDART_IMPLEMENTATIONS=mpi \
+                        -DENABLE_THREADSUPPORT=ON \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=OFF \
                         -DENABLE_LT_OPTIMIZATION=OFF \
                         -DENABLE_ASSERTIONS=ON \

build.dev.sh

@@ -61,6 +61,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0-dev/ \
                         -DDART_IMPLEMENTATIONS=mpi \
+                        -DENABLE_THREADSUPPORT=ON \
                         -DENABLE_ASSERTIONS=ON \
                         -DENABLE_LT_OPTIMIZATION=OFF \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=ON \

build.mic.sh

@@ -51,6 +51,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0-mic/ \
                         -DDART_IMPLEMENTATIONS=mpi \
+                        -DENABLE_THREADSUPPORT=ON \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=OFF \
                         -DENABLE_EXTENDED_COMPILER_WARNINGS=OFF \
                         -DENABLE_ASSERTIONS=OFF \

build.minimal.sh

@@ -53,6 +53,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0/ \
                         -DDART_IMPLEMENTATIONS=mpi \
+                        -DENABLE_THREADSUPPORT=OFF \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=OFF \
                         -DENABLE_EXTENDED_COMPILER_WARNINGS=OFF \
                         -DENABLE_LT_OPTIMIZATION=OFF \

build.nasty.sh

@@ -66,6 +66,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0-nasty \
                         -DDART_IMPLEMENTATIONS=mpi \
+                        -DENABLE_THREADSUPPORT=ON \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=OFF \
                         -DENABLE_EXTENDED_COMPILER_WARNINGS=OFF \
                         -DENABLE_LT_OPTIMIZATION=OFF \

build.sh

@@ -59,7 +59,7 @@ rm -Rf $BUILD_DIR/*
                         -DDART_IF_VERSION=3.2 \
                         -DINSTALL_PREFIX=$HOME/opt/dash-0.3.0/ \
                         -DDART_IMPLEMENTATIONS=mpi \
-                        -DENABLE_THREADING=ON \
+                        -DENABLE_THREADSUPPORT=ON \
                         -DENABLE_DEVELOPER_COMPILER_WARNINGS=OFF \
                         -DENABLE_EXTENDED_COMPILER_WARNINGS=OFF \
                         -DENABLE_LT_OPTIMIZATION=OFF \

dart-if/v3.2/include/dash/dart/if/dart_initialization.h

@@ -52,7 +52,7 @@ dart_ret_t dart_init(int *argc, char ***argv);
 dart_ret_t dart_init_thread(
   int*                  argc,
   char***               argv,
-  dart_thread_level_t * thread_safety);
+  dart_thread_support_level_t * thread_safety);
 
 /**
  * Finalize the DASH runtime.

dart-if/v3.2/include/dash/dart/if/dart_types.h

@@ -225,7 +225,7 @@ typedef enum
    * the underlying runtime.
    */
   DART_THREAD_MULTIPLE = 10
-} dart_thread_level_t;
+} dart_thread_support_level_t;
 
 /**
  * Scopes of locality domains.