Simulation: have simulation tasks run in their own thread.

Author: agarny

cmake/buildpackage.cmake.in

@@ -18,4 +18,4 @@ project(@PACKAGE_NAME@)
 
 include(ExternalProject)
 
-ExternalProject_Add(@PACKAGE_NAME@ @ARGN@)
+ExternalProject_Add(@PACKAGE_NAME@ @ARGN_QUOTED@)

cmake/common.cmake

@@ -108,6 +108,7 @@ function(configure_target TARGET)
                 -Wno-global-constructors
                 -Wno-padded
                 -Wno-switch-enum
+                -Wno-thread-safety-negative
                 -Wno-unsafe-buffer-usage
                 -Wno-weak-vtables
             )

cmake/packages.cmake

@@ -57,6 +57,21 @@ function(build_package PACKAGE_NAME)
 
     message(STATUS "Building ${PACKAGE_NAME}")
 
+    set(ARGN_QUOTED)
+
+    foreach(ARG ${ARGN})
+        string(REPLACE "\\" "\\\\" ARG_ESCAPED "${ARG}")
+        string(REPLACE "\"" "\\\"" ARG_ESCAPED "${ARG_ESCAPED}")
+
+        if(NOT WIN32)
+            string(REPLACE " " "\\ " ARG_ESCAPED "${ARG_ESCAPED}")
+        endif()
+
+        list(APPEND ARGN_QUOTED "\"${ARG_ESCAPED}\"")
+    endforeach()
+
+    string(REPLACE ";" " " ARGN_QUOTED "${ARGN_QUOTED}")
+
     configure_file(${CMAKE_SOURCE_DIR}/cmake/buildpackage.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt)
 
     if(EMSCRIPTEN)
@@ -263,8 +278,15 @@ function(retrieve_package PACKAGE_NAME PACKAGE_VERSION PACKAGE_REPOSITORY RELEAS
     add_custom_target(${PACKAGE_NAME})
 endfunction()
 
-function(escape_path OLD_PATH NEW_PATH)
-    # Escape spaces and parentheses in a path.
+function(safe_path OLD_PATH NEW_PATH)
+    # Make a path safe for use in CMake arguments by double quoting it on Windows and by escaping spaces and parentheses
+    # on Linux and macOS.
+
+    if(WIN32)
+        set(${NEW_PATH} "${OLD_PATH}" PARENT_SCOPE)
+
+        return()
+    endif()
 
     string(REPLACE " " "\\ " NEW_PATH_VALUE "${OLD_PATH}")
     string(REPLACE "(" "\\(" NEW_PATH_VALUE "${NEW_PATH_VALUE}")
@@ -276,7 +298,7 @@ endfunction()
 # Determine the platform on which we are and the architecture on which we want to build.
 
 if(EMSCRIPTEN)
-    set(TARGET_PLATFORM_ARCHITECTURE wasm)
+    set(TARGET_PLATFORM_ARCHITECTURE wasm-threaded) #---GRY--- This should eventually be renamed to just "wasm" once we are done with running simulations in their own thread.
 else()
     if(WIN32)
         if(RELEASE_MODE)
@@ -336,8 +358,8 @@ if(APPLE)
 endif()
 
 if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER)
-    escape_path(${CMAKE_C_COMPILER_LAUNCHER} EP_CMAKE_C_COMPILER_LAUNCHER)
-    escape_path(${CMAKE_CXX_COMPILER_LAUNCHER} EP_CMAKE_CXX_COMPILER_LAUNCHER)
+    safe_path(${CMAKE_C_COMPILER_LAUNCHER} EP_CMAKE_C_COMPILER_LAUNCHER)
+    safe_path(${CMAKE_CXX_COMPILER_LAUNCHER} EP_CMAKE_CXX_COMPILER_LAUNCHER)
 
     list(APPEND CMAKE_ARGS
         -DCMAKE_C_COMPILER_LAUNCHER=${EP_CMAKE_C_COMPILER_LAUNCHER}
@@ -346,13 +368,20 @@ if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER)
 endif()
 
 if(EMSCRIPTEN)
+    # Note: we are using the same CMake variables that we used to build libOpenCOR so that we can build our third-party
+    #       libraries in the same way that we built libOpenCOR.
+
     list(APPEND CMAKE_ARGS
         -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DCMAKE_CROSSCOMPILING_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}
+        -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+        -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+        -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+        -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
     )
 else()
-    escape_path(${CMAKE_C_COMPILER} EP_CMAKE_C_COMPILER)
-    escape_path(${CMAKE_CXX_COMPILER} EP_CMAKE_CXX_COMPILER)
+    safe_path(${CMAKE_C_COMPILER} EP_CMAKE_C_COMPILER)
+    safe_path(${CMAKE_CXX_COMPILER} EP_CMAKE_CXX_COMPILER)
 
     list(APPEND CMAKE_ARGS
         -DCMAKE_C_COMPILER=${EP_CMAKE_C_COMPILER}

src/3rdparty/LLVMClang/CMakeLists.txt

@@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_LLVMCLANG)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         8dcd04b80f13bec0c3fa37b277d06466dcb8ac4a)
+                         4f2906d4b6df1b0be5a636a88f7582425b30df49)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/SUNDIALS/CMakeLists.txt

@@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_SUNDIALS)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         d51821a5f6edf151e72e53ad9edb700022e44b98)
+                         770a7e84f8e986310c6ece0ed662e4ef11035c8d)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/libCOMBINE/CMakeLists.txt

@@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBCOMBINE)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         136ff852592abaaaaf4fb8ec4ad65d09850d5d0a)
+                         607e967bb9cd5bb97f285fc732dc4ca77c03e154)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/libCellML/CMakeLists.txt

@@ -34,7 +34,7 @@ if(LIBOPENCOR_PREBUILT_LIBCELLML)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         5cb4721d595594e82506c2b100642f34a7426e67)
+                         e4739c98f7a79436185934be1882baaaac9b314a)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/libNuML/CMakeLists.txt

@@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBNUML)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         5f3ae380ed2234c11e62cc71739cbb54455d2de9)
+                         90fcef0fdf7d2b7521816411c99c149162bdaa13)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/libSBML/CMakeLists.txt

@@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBSBML)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         54f84ef32f6a70cb7cbe6ffc4251d7762ec3c755)
+                         a5548423665edde4e2d88a9db1b15d9d4abeadb3)
     else()
         if(WIN32)
             if(RELEASE_MODE)

src/3rdparty/libSEDML/CMakeLists.txt

@@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBSEDML)
     if(EMSCRIPTEN)
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         26f6d51198456c6efc70b94f66a5a55d2a14ef47)
+                         48270118e62002f1fbb34c88d20c57b6b38d1cdf)
     else()
         if(WIN32)
             if(RELEASE_MODE)