dylib rework

Author: zaucy

dylib/BUILD.bazel

@@ -1,5 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:copts.bzl", "copts")
+load("//:index.bzl", "ecsact_runtime_modules")
+load(":index.bzl", "cc_ecsact_dylib")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -11,13 +13,9 @@ cc_library(
     copts = copts,
 )
 
-cc_library(
-    name = "meta",
-    srcs = ["meta-dylib.cc"],
+# Convenient targets
+[cc_ecsact_dylib(
+    name = m,
     copts = copts,
-    defines = ["ECSACT_META_API_LOAD_AT_RUNTIME"],
-    deps = [
-        ":util",
-        "//:meta",
-    ],
-)
+    ecsact_modules = [m],
+) for m in ecsact_runtime_modules]

dylib/README.md

@@ -2,10 +2,48 @@
 #include <cassert>
 #include "ecsact/runtime/dylib.h"
 
+#ifdef ECSACT_ASYNC_API_LOAD_AT_RUNTIME
+#	include "ecsact/runtime/async.h"
+#endif
+
+#ifdef ECSACT_CORE_API_LOAD_AT_RUNTIME
+#	include "ecsact/runtime/core.h"
+#endif
+
+#ifdef ECSACT_DYNAMIC_API_LOAD_AT_RUNTIME
+#	include "ecsact/runtime/dynamic.h"
+#endif
+
 #ifdef ECSACT_META_API_LOAD_AT_RUNTIME
 #	include "ecsact/runtime/meta.h"
 #endif
 
+#ifdef ECSACT_SERIALIZE_API_LOAD_AT_RUNTIME
+#	include "ecsact/runtime/serialize.h"
+#endif
+
+#include "./dylib-util.hh"
+
+#ifdef ECSACT_ASYNC_API_LOAD_AT_RUNTIME
+FOR_EACH_ECSACT_ASYNC_API_FN(ECSACT_DYLIB_UTIL_FN_PTR_DEFN);
+#endif
+
+#ifdef ECSACT_CORE_API_LOAD_AT_RUNTIME
+FOR_EACH_ECSACT_CORE_API_FN(ECSACT_DYLIB_UTIL_FN_PTR_DEFN);
+#endif
+
+#ifdef ECSACT_DYNAMIC_API_LOAD_AT_RUNTIME
+FOR_EACH_ECSACT_DYNAMIC_API_FN(ECSACT_DYLIB_UTIL_FN_PTR_DEFN);
+#endif
+
+#ifdef ECSACT_META_API_LOAD_AT_RUNTIME
+FOR_EACH_ECSACT_META_API_FN(ECSACT_DYLIB_UTIL_FN_PTR_DEFN);
+#endif
+
+#ifdef ECSACT_SERIALIZE_API_LOAD_AT_RUNTIME
+FOR_EACH_ECSACT_SERIALIZE_API_FN(ECSACT_DYLIB_UTIL_FN_PTR_DEFN);
+#endif
+
 #define HAS_FN_CHECK(fn_name, target_fn_name) \
 	if(std::strcmp(target_fn_name, #fn_name) == 0) return true
 
@@ -16,9 +54,26 @@
 	static_assert(true, "macro requires ;")
 
 bool ecsact_dylib_has_fn(const char* fn_name) {
+#ifdef ECSACT_ASYNC_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_ASYNC_API_FN(HAS_FN_CHECK, fn_name);
+#endif
+
+#ifdef ECSACT_CORE_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_CORE_API_FN(HAS_FN_CHECK, fn_name);
+#endif
+
+#ifdef ECSACT_DYNAMIC_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_DYNAMIC_API_FN(HAS_FN_CHECK, fn_name);
+#endif
+
 #ifdef ECSACT_META_API_LOAD_AT_RUNTIME
 	FOR_EACH_ECSACT_META_API_FN(HAS_FN_CHECK, fn_name);
 #endif
+
+#ifdef ECSACT_SERIALIZE_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_SERIALIZE_API_FN(HAS_FN_CHECK, fn_name);
+#endif
+
 	return false;
 }
 
@@ -30,7 +85,23 @@ void ecsact_dylib_set_fn_addr(const char* fn_name, void (*fn_ptr)()) {
 	}
 #endif // NDEBUG
 
+#ifdef ECSACT_ASYNC_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_ASYNC_API_FN(ASSIGN_FN_IF, fn_name, fn_ptr);
+#endif
+
+#ifdef ECSACT_CORE_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_CORE_API_FN(ASSIGN_FN_IF, fn_name, fn_ptr);
+#endif
+
+#ifdef ECSACT_DYNAMIC_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_DYNAMIC_API_FN(ASSIGN_FN_IF, fn_name, fn_ptr);
+#endif
+
 #ifdef ECSACT_META_API_LOAD_AT_RUNTIME
 	FOR_EACH_ECSACT_META_API_FN(ASSIGN_FN_IF, fn_name, fn_ptr);
 #endif
+
+#ifdef ECSACT_SERIALIZE_API_LOAD_AT_RUNTIME
+	FOR_EACH_ECSACT_SERIALIZE_API_FN(ASSIGN_FN_IF, fn_name, fn_ptr);
+#endif
 }

dylib/dylib.cc

@@ -17,19 +17,16 @@ def cc_ecsact_dylib(name = None, srcs = [], ecsact_modules = [], deps = [], defi
         defines: Passed to underlying cc_library
         **kwargs: Passed to underlying cc_library
     """
-    srcs.append("@ecsact_runtime//dylib:dylib.cc")
-    deps.append("@ecsact_runtime//:dylib")
 
     for ecsact_module in ecsact_modules:
         if not ecsact_module in ecsact_runtime_modules:
             fail("Invalid ecsact module '{}'\nAllowed values: {}".format(ecsact_module, ",".join(ecsact_runtime_modules)))
 
-        deps.append("@ecsact_runtime//dylib:{}".format(ecsact_module))
-        defines.append("ECSACT_{}_API_LOAD_AT_RUNTIME".format(ecsact_module.upper()))
-
     cc_library(
         name = name,
-        deps = deps,
-        defines = defines,
+        deps = deps + ["@ecsact_runtime//:dylib", "@ecsact_runtime//dylib:util"] + ["@ecsact_runtime//:{}".format(m) for m in ecsact_modules],
+        srcs = srcs + ["@ecsact_runtime//dylib:dylib.cc"],
+        defines = defines +
+                  ["ECSACT_{}_API_LOAD_AT_RUNTIME".format(m.upper()) for m in ecsact_modules],
         **kwargs
     )