Merge pull request #533 from metacall/feature/run-outside-metacall-cli

Implement support for running MetaCall from `python.exe` and `node.exe`.

Author: viferga

.github/workflows/docker-hub-platform.yml

@@ -94,6 +94,8 @@ jobs:
   manifest:
     name: Create and Push Manifest Lists
     needs: build
+    # Only run when master or when tagging a version
+    if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
@@ -104,10 +106,15 @@ jobs:
 
       - name: Create and Push Manifest Lists
         run: |
-          for tag in "deps" "dev" "runtime" "cli"; do
+          tags=("deps" "dev" "runtime" "cli")
+          platforms=("linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6")
+
+          echo "Create all the tags by platform"
+
+          for tag in "${tags[@]}"; do
             echo "Creating manifest for tag: $tag"
             platform_tags=""
-            for platform in "linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6"; do
+            for platform in "${platforms[@]}"; do
               platform_tag=$(echo "${platform}" | tr '/' '-')
               platform_tags="${platform_tags} ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}"
             done
@@ -116,28 +123,32 @@ jobs:
             docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}
           done
 
-      - name: Create Version Specific Tags
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          tags=("deps" "dev" "runtime" "cli")
-          platforms=("linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6")
-          for tag in "${tags[@]}"; do
-            platform_tags=""
-            for platform in "${platforms[@]}"; do
-              platform_tags="${platform_tags} ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform}"
-            done
-            docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag} ${platform_tags} --amend
-            docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag}
-          done
+          echo "Create the latest tag"
 
           cli_platform_tags=""
-          for platform in ${{ matrix.platform }}; do
-            cli_platform_tags="${cli_platform_tags} ${DOCKER_USERNAME}/${IMAGE_NAME}:cli-${platform}"
+          for platform in ${platforms[@]}"; do
+              platform_tag=$(echo "${platform}" | tr '/' '-')
+            cli_platform_tags="${cli_platform_tags} ${DOCKER_USERNAME}/${IMAGE_NAME}:cli-${platform_tag}"
           done
           docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:latest ${cli_platform_tags} --amend
           docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:latest
 
+          if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" = true ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+
+            echo "Create the version ${VERSION} tag"
+
+            for tag in "${tags[@]}"; do
+              platform_tags=""
+              for platform in "${platforms[@]}"; do
+                platform_tag=$(echo "${platform}" | tr '/' '-')
+                platform_tags="${platform_tags} ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${tag}-${platform_tag}"
+              done
+              docker manifest create ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag} ${platform_tags} --amend
+              docker manifest push ${DOCKER_REGISTRY}/${DOCKER_USERNAME}/${IMAGE_NAME}:${VERSION}-${tag}
+            done
+          fi
+
   cleanup:
     name: Cleanup Platform Specific Tags
     needs: [build, manifest]
@@ -146,16 +157,19 @@ jobs:
     steps:
       - name: Remove Platform-Specific Tags
         run: |
-          platforms=("linux-amd64" "linux-386" "linux-arm64" "linux-riscv64" "linux-ppc64le" "linux-s390x" "linux-arm-v7" "linux-arm-v6")
           tags=("deps" "dev" "runtime" "cli")
+          platforms=("linux/amd64" "linux/386" "linux/arm64" "linux/riscv64" "linux/ppc64le" "linux/s390x" "linux/arm/v7" "linux/arm/v6")
+
+          for tag in "${tags[@]}"; do
+            for platform in "${platforms[@]}"; do
+              platform_tag=$(echo "${platform}" | tr '/' '-')
+              tag_to_delete="${tag}-${platform_tag}"
 
-          for platform in "${platforms[@]}"; do
-            for tag in "${tags[@]}"; do
-              tag_to_delete="${tag}-${platform}"
               echo "Deleting tag: ${tag_to_delete}"
+              echo "https://hub.docker.com/v2/repositories/${DOCKER_USERNAME}/${IMAGE_NAME}/tags/${tag_to_delete}/"
 
               curl -X DELETE \
-                -H "Authorization: Bearer ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}" \
+                -H "Authorization: Bearer ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_DELETE }}" \
                 "https://hub.docker.com/v2/repositories/${DOCKER_USERNAME}/${IMAGE_NAME}/tags/${tag_to_delete}/"
             done
           done

CMakeLists.txt

@@ -22,7 +22,7 @@
 #
 
 # CMake version
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # Include cmake modules
 
@@ -241,6 +241,9 @@ else()
 	endif()
 endif()
 
+# Export compile commands
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 #
 # CTest configuration
 #

cmake/CompileOptions.cmake

@@ -149,6 +149,72 @@ else()
 	set(SANITIZER_COMPILE_DEFINITIONS)
 endif()
 
+function(find_sanitizer NAME LINK_OPTION)
+	string(TOUPPER "${NAME}" NAME_UPPER)
+	set(SANITIZER_PROGRAM_CODE "int main() {return 0;}")
+	file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate.cpp" "${SANITIZER_PROGRAM_CODE}")
+
+	try_compile(
+		STATUS
+			${PROJECT_OUTPUT_DIR}
+			${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate.cpp
+		OUTPUT_VARIABLE SANITIZER_COMPILER_OUTPUT
+		LINK_OPTIONS ${LINK_OPTION}
+		COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate
+	)
+
+	if(NOT STATUS)
+		message(FATAL_ERROR "Could not find location for lib${NAME}: ${SANITIZER_COMPILER_OUTPUT}")
+		return()
+	endif()
+
+	file(GET_RUNTIME_DEPENDENCIES
+		EXECUTABLES ${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate
+		RESOLVED_DEPENDENCIES_VAR SANITIZER_PROGRAM_LIBRARIES
+	)
+
+	foreach(DEPENDENCY IN LISTS SANITIZER_PROGRAM_LIBRARIES)
+		string(FIND "${DEPENDENCY}" "${NAME}" POSITION)
+		if(POSITION GREATER -1)
+			set(LIB${NAME_UPPER}_PATH "${DEPENDENCY}" PARENT_SCOPE)
+			return()
+		endif()
+	endforeach()
+endfunction()
+
+if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
+	if(OPTION_BUILD_THREAD_SANITIZER)
+		find_sanitizer(tsan -fsanitize=thread)
+		set(SANITIZER_LIBRARIES_PATH
+			"${LIBTSAN_PATH}"
+		)
+	elseif(OPTION_BUILD_MEMORY_SANITIZER)
+		set(SANITIZER_LIBRARIES_PATH) # TODO
+	elseif(OPTION_BUILD_ADDRESS_SANITIZER)
+		find_sanitizer(asan -fsanitize=address)
+		find_sanitizer(ubsan -fsanitize=undefined)
+		set(SANITIZER_LIBRARIES_PATH
+			"${LIBASAN_PATH}"
+			"${LIBUBSAN_PATH}"
+		)
+	endif()
+endif()
+
+if(SANITIZER_LIBRARIES_PATH)
+	if(PROJECT_OS_LINUX)
+		list(JOIN SANITIZER_LIBRARIES_PATH " " SANITIZER_LIBRARIES_PATH_JOINED)
+		set(TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES
+			"LD_PRELOAD=${SANITIZER_LIBRARIES_PATH_JOINED}"
+		)
+	elseif(PROJECT_OS_FAMILY MATCHES "macos")
+		list(JOIN SANITIZER_LIBRARIES_PATH ":" SANITIZER_LIBRARIES_PATH_JOINED)
+		set(TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES
+			"DYLD_INSERT_LIBRARIES=${SANITIZER_LIBRARIES_PATH_JOINED}"
+			"DYLD_FORCE_FLAT_NAMESPACE=1"
+		)
+	endif()
+endif()
+
 if((PROJECT_OS_WIN AND MSVC) OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 	# MSVC and Clang do not require to link manually the sanitizer libraries
 	set(SANITIZER_LIBRARIES)

cmake/InstallRapidJSON.cmake

@@ -28,19 +28,17 @@ if(NOT RAPIDJSON_FOUND OR USE_BUNDLED_RAPIDJSON)
 	endif()
 
 	ExternalProject_Add(rapid-json-depends
-		GIT_REPOSITORY	"https://github.com/Tencent/rapidjson.git"
-		GIT_TAG			"${RAPIDJSON_VERSION}"
-		CMAKE_ARGS
-			-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-			-DRAPIDJSON_BUILD_DOC=Off
-			-DRAPIDJSON_BUILD_EXAMPLES=Off
-			-DRAPIDJSON_BUILD_TESTS=Off
-		TEST_COMMAND	""
+		GIT_REPOSITORY		"https://github.com/Tencent/rapidjson.git"
+		GIT_TAG				"${RAPIDJSON_VERSION}"
+		BUILD_COMMAND		""
+		CONFIGURE_COMMAND	""
+		INSTALL_COMMAND		""
+		TEST_COMMAND		""
 	)
 
-	ExternalProject_Get_Property(rapid-json-depends INSTALL_DIR)
+	ExternalProject_Get_Property(rapid-json-depends SOURCE_DIR)
 
-	set(RAPIDJSON_ROOT_DIR		${INSTALL_DIR})
+	set(RAPIDJSON_ROOT_DIR		${SOURCE_DIR})
 	set(RAPIDJSON_INCLUDE_DIRS	${RAPIDJSON_ROOT_DIR}/include)
 	set(RAPIDJSON_FOUND			TRUE)
 

source/adt/CMakeLists.txt

@@ -164,7 +164,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 
 	PUBLIC

source/benchmarks/log_bench/CMakeLists.txt

@@ -108,7 +108,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_cs_call_bench/CMakeLists.txt

@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_cs_call_bench/source/metacall_cs_call_bench.cpp

@@ -186,5 +186,7 @@ int main(int argc, char **argv)
 
 	::benchmark::RunSpecifiedBenchmarks();
 
-	return metacall_destroy();
+	metacall_destroy();
+
+	return 0;
 }

source/benchmarks/metacall_node_call_bench/CMakeLists.txt

@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_node_call_bench/source/metacall_node_call_bench.cpp

@@ -292,5 +292,7 @@ int main(int argc, char **argv)
 	}
 #endif /* OPTION_BUILD_LOADERS_NODE */
 
-	return metacall_destroy();
+	metacall_destroy();
+
+	return 0;
 }

source/benchmarks/metacall_py_c_api_bench/CMakeLists.txt

@@ -121,7 +121,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_py_call_bench/CMakeLists.txt

@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_py_call_bench/source/metacall_py_call_bench.cpp

@@ -178,10 +178,7 @@ int main(int argc, char *argv[])
 	::benchmark::RunSpecifiedBenchmarks();
 	::benchmark::Shutdown();
 
-	if (metacall_destroy() != 0)
-	{
-		return 4;
-	}
+	metacall_destroy();
 
 	return 0;
 }

source/benchmarks/metacall_py_init_bench/CMakeLists.txt

@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_py_init_bench/source/metacall_py_init_bench.cpp

@@ -130,10 +130,7 @@ BENCHMARK_DEFINE_F(metacall_py_init_bench, destroy)
 /* Python */
 #if defined(OPTION_BUILD_LOADERS_PY)
 		{
-			if (metacall_destroy() != 0)
-			{
-				state.SkipWithError("Error destroying MetaCall");
-			}
+			metacall_destroy();
 		}
 #endif /* OPTION_BUILD_LOADERS_PY */
 	}

source/benchmarks/metacall_rb_call_bench/CMakeLists.txt

@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/benchmarks/metacall_rb_call_bench/source/metacall_rb_call_bench.cpp

@@ -198,10 +198,7 @@ int main(int argc, char *argv[])
 	::benchmark::RunSpecifiedBenchmarks();
 	::benchmark::Shutdown();
 
-	if (metacall_destroy() != 0)
-	{
-		return 4;
-	}
+	metacall_destroy();
 
 	return 0;
 }

source/cli/metacallcli/CMakeLists.txt

@@ -139,7 +139,7 @@ target_compile_features(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

source/cli/metacallcli/source/application.cpp

@@ -299,12 +299,7 @@ application::application(int argc, char *argv[]) :
 
 application::~application()
 {
-	int result = metacall_destroy();
-
-	if (result != 0)
-	{
-		std::cout << "Error while destroying MetaCall, exit code: " << result << std::endl;
-	}
+	metacall_destroy();
 }
 
 void application::arguments_parse(std::vector<std::string> &arguments)

source/cli/plugins/cli_core_plugin/CMakeLists.txt

@@ -180,7 +180,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+target_link_options(${target}
 	PRIVATE
 
 	PUBLIC

source/cli/plugins/cli_core_plugin/include/cli_core_plugin/cli_core_plugin.h

@@ -23,16 +23,12 @@
 
 #include <cli_core_plugin/cli_core_plugin_api.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CLI_CORE_PLUGIN_API int cli_core_plugin(void *loader, void *handle);
 
-DYNLINK_SYMBOL_EXPORT(cli_core_plugin);
-
 #ifdef __cplusplus
 }
 #endif