Move containers library to be an object library instead of a list of …

…sources
dotnet · jkoritzinsky · Jun 24, 2024 · Jun 6, 2024 · Jun 7, 2024 · Jun 7, 2024
commit 8a3bb1c15e83377d79a60b5375083ddabf545c54
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -125,6 +125,8 @@ add_subdirectory(pal/prebuilt/inc)
 set(EP_GENERATED_HEADER_PATH "${GENERATED_INCLUDE_DIR}")
 include (${CLR_SRC_NATIVE_DIR}/eventpipe/configure.cmake)
 
+add_subdirectory(${CLR_SRC_NATIVE_DIR}/containers containers)
+
 if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS)
   add_subdirectory(debug/debug-pal)
 endif()

@@ -106,8 +106,6 @@ endif()
 
 set(AOT_EVENTPIPE_SHIM_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
 set (MINIPAL_SOURCES "")
 set (EVENTPIPE_SOURCES "")
 set (EVENTPIPE_HEADERS "")
@@ -122,7 +120,6 @@ set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
 set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 set (SHARED_MINIPAL_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/minipal")
 include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
 
 list(APPEND MINIPAL_SOURCES
   utf8.c
@@ -164,8 +161,6 @@ list(APPEND EVENTPIPE_HEADERS
   ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
 )
 
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
 addprefix(MINIPAL_SOURCES ${SHARED_MINIPAL_SOURCE_PATH} "${MINIPAL_SOURCES}")
 
 addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
@@ -174,11 +169,9 @@ addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS
 set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ep-sources.c PROPERTIES COMPILE_DEFINITIONS EP_FORCE_INCLUDE_SOURCE_FILES)
 set_source_files_properties(${SHARED_EVENTPIPE_SOURCE_PATH}/ds-sources.c PROPERTIES COMPILE_DEFINITIONS DS_FORCE_INCLUDE_SOURCE_FILES)
 
-set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES LANGUAGE CXX)
 set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES LANGUAGE CXX)
 
 if(CLR_CMAKE_HOST_UNIX)
-    set_source_files_properties(${CONTAINER_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
     set_source_files_properties(${EVENTPIPE_SOURCES} PROPERTIES COMPILE_OPTIONS -xc++)
 endif(CLR_CMAKE_HOST_UNIX)
 
@@ -188,7 +181,7 @@ endif()
 
 list(APPEND AOT_EVENTPIPE_SHIM_SOURCES
   ${AOT_EVENTPIPE_SHIM_DIR}/ep-rt-aot.cpp
-  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp  
+  ${AOT_EVENTPIPE_SHIM_DIR}/ds-rt-aot.cpp
 )
 
 list(APPEND AOT_EVENTPIPE_SHIM_HEADERS
@@ -239,8 +232,6 @@ list(APPEND EVENTPIPE_SOURCES
   ${SHARED_EVENTPIPE_CONFIG_HEADERS}
   ${GEN_EVENTPIPE_PROVIDER_SOURCES}
   ${GEN_EVENTPIPE_PLAT_AGNOSTIC_SOURCES}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
   ${MINIPAL_SOURCES}
 )
 
@@ -253,6 +244,7 @@ list(APPEND AOT_EVENTPIPE_DISABLED_SOURCES
 )
 
 add_library(eventpipe-enabled STATIC ${EVENTPIPE_SOURCES})
+target_link_libraries(eventpipe-enabled PRIVATE dn-containers)
 add_dependencies(eventpipe-enabled aot_eventing_headers)
 if(CLR_CMAKE_TARGET_WIN32)
   add_dependencies(eventpipe-enabled aot_etw_headers)
@@ -265,6 +257,7 @@ if (CLR_CMAKE_TARGET_WIN32)
   add_library(eventpipe-enabled.GuardCF STATIC ${EVENTPIPE_SOURCES})
   add_dependencies(eventpipe-enabled.GuardCF aot_eventing_headers)
   add_dependencies(eventpipe-enabled.GuardCF aot_etw_headers)
+  target_link_libraries(eventpipe-enabled.GuardCF PRIVATE dn-containers)
   add_library(eventpipe-disabled.GuardCF STATIC ${AOT_EVENTPIPE_DISABLED_SOURCES})
   add_dependencies(eventpipe-disabled.GuardCF aot_eventing_headers)
   set_target_properties(eventpipe-enabled.GuardCF PROPERTIES CLR_CONTROL_FLOW_GUARD ON)
@@ -276,4 +269,4 @@ install_static_library(eventpipe-disabled aotsdk nativeaot)
 if (CLR_CMAKE_TARGET_WIN32)
   install_static_library(eventpipe-enabled.GuardCF aotsdk nativeaot)
   install_static_library(eventpipe-disabled.GuardCF aotsdk nativeaot)
-endif (CLR_CMAKE_TARGET_WIN32)
+endif (CLR_CMAKE_TARGET_WIN32)
diff --git a/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt b/src/coreclr/vm/eventing/eventpipe/CMakeLists.txt
@@ -28,8 +28,6 @@ add_custom_command(OUTPUT ${GEN_EVENTPIPE_SOURCES}
   COMMAND ${GENERATE_COMMAND}
   DEPENDS ${GENERATE_SCRIPT} ${EVENT_MANIFEST} ${EVENT_EXCLUSIONS})
 
-set (CONTAINER_SOURCES "")
-set (CONTAINER_HEADERS "")
 set (EVENTPIPE_SOURCES "")
 set (EVENTPIPE_HEADERS "")
 set (CORECLR_EVENTPIPE_SHIM_SOURCES "")
@@ -39,7 +37,6 @@ set (SHARED_CONTAINERS_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/containers")
 set (SHARED_EVENTPIPE_SOURCE_PATH "${CLR_SRC_NATIVE_DIR}/eventpipe")
 set (CORECLR_EVENTPIPE_SHIM_SOURCE_PATH "${CORECLR_EVENTPIPE_SHIM_DIR}")
 
-include (${SHARED_CONTAINERS_SOURCE_PATH}/containers.cmake)
 include (${SHARED_EVENTPIPE_SOURCE_PATH}/eventpipe.cmake)
 
 list(APPEND EVENTPIPE_SOURCES
@@ -52,9 +49,6 @@ list(APPEND EVENTPIPE_HEADERS
   ${SHARED_DIAGNOSTIC_SERVER_HEADERS}
 )
 
-addprefix(CONTAINER_SOURCES ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_SOURCES}")
-addprefix(CONTAINER_HEADERS ${SHARED_CONTAINERS_SOURCE_PATH} "${SHARED_CONTAINER_HEADERS}")
-
 addprefix(EVENTPIPE_SOURCES ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_SOURCES}")
 addprefix(EVENTPIPE_HEADERS ${SHARED_EVENTPIPE_SOURCE_PATH} "${EVENTPIPE_HEADERS}")
 
@@ -90,8 +84,6 @@ list(APPEND EVENTPIPE_SOURCES
   ${CORECLR_EVENTPIPE_SHIM_HEADERS}
   ${EVENTPIPE_HEADERS}
   ${SHARED_EVENTPIPE_CONFIG_HEADERS}
-  ${CONTAINER_SOURCES}
-  ${CONTAINER_HEADERS}
 )
 
 add_library_clr(eventpipe_gen_objs OBJECT ${GEN_EVENTPIPE_SOURCES})
@@ -103,6 +95,7 @@ add_library_clr(eventpipe_objs OBJECT ${EVENTPIPE_SOURCES})
 target_precompile_headers(eventpipe_objs PRIVATE [["common.h"]])
 set_target_properties(eventpipe_objs PROPERTIES LINKER_LANGUAGE CXX)
 add_dependencies(eventpipe_objs eventing_headers)
+target_link_libraries(eventpipe_objs INTERFACE dn-containers)
 
 add_library(eventpipe INTERFACE)
-target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs>)
+target_sources(eventpipe INTERFACE $<TARGET_OBJECTS:eventpipe_gen_objs> $<TARGET_OBJECTS:eventpipe_objs> $<TARGET_OBJECTS:dn-containers>)
@@ -9,6 +9,8 @@ set(MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME "diagnostics_tracing")
 set(MONO_DEBUGGER_COMPONENT_NAME "debugger")
 set(MONO_MARSHAL_ILGEN_COMPONENT_NAME "marshal-ilgen")
 
+add_subdirectory(${SHARED_CONTAINERS_SOURCE_PATH} containers)
+
 # a list of every component.
 set(components "")
 # a list of components needed by the AOT compiler
@@ -70,7 +72,6 @@ include_directories(
 )
 
 set(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-sources
-  ${container_sources}
   ${eventpipe_sources}
   ${diagnostic_server_sources}
   ${MONO_COMPONENT_PATH}/event_pipe.c
@@ -166,6 +167,10 @@ foreach(component IN LISTS components)
   target_link_libraries("${component}-stub-objects" PUBLIC eglib_api)
 endforeach()
 
+if (TARGET "${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects")
+    target_link_libraries("${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-objects" PRIVATE dn-containers)
+endif()
+
 if(NOT DISABLE_COMPONENTS AND NOT STATIC_COMPONENTS)
   # define a shared library for each component
   foreach(component IN LISTS components_to_build)

@@ -10,17 +10,6 @@ if(ENABLE_PERFTRACING)
         add_definitions(-DBIGENDIAN)
     endif (TARGET_S390X)
 
-    include (${SHARED_CONTAINERS_SOURCE_PATH}containers.cmake)
-
-    set(container_sources "")
-
-    list(APPEND container_sources
-        ${SHARED_CONTAINER_SOURCES}
-        ${SHARED_CONTAINER_HEADERS}
-    )
-
-    addprefix(container_sources ${SHARED_CONTAINERS_SOURCE_PATH} "${container_sources}")
-
     include (${SHARED_EVENTPIPE_SOURCE_PATH}eventpipe.cmake)
 
     set(MONO_EVENTPIPE_SHIM_SOURCES "")

@@ -49,14 +49,6 @@ endif()
 # MINI
 #
 
-set(imported_native_sources
-    ../../../native/containers/dn-simdhash.c
-    ../../../native/containers/dn-simdhash-ptr-ptr.c
-    ../../../native/containers/dn-simdhash-string-ptr.c
-    ../../../native/containers/dn-simdhash-u32-ptr.c
-    ../../../native/containers/dn-simdhash-ght-compatible.c
-    ../../../native/containers/dn-simdhash-ptrpair-ptr.c)
-
 set(mini_common_sources
     mini.c
     mini-runtime.c
@@ -310,7 +302,7 @@ else()
 set(profiler_sources "")
 endif()
 
-set(mini_sources "main-core.c;${imported_native_sources};${mini_common_sources};${arch_sources};${os_sources};${mini_interp_sources};${llvm_sources};${debugger_sources};${profiler_sources};${llvm_runtime_sources}")
+set(mini_sources "main-core.c;${mini_common_sources};${arch_sources};${os_sources};${mini_interp_sources};${llvm_sources};${debugger_sources};${profiler_sources};${llvm_runtime_sources}")
 
 if(LLVM_INCLUDEDIR)
   include_directories(BEFORE SYSTEM "${LLVM_INCLUDEDIR}")
@@ -341,6 +333,7 @@ endif()
 
 add_library(monosgen-static STATIC $<TARGET_OBJECTS:eglib_objects> $<TARGET_OBJECTS:utils_objects> $<TARGET_OBJECTS:sgen_objects> $<TARGET_OBJECTS:metadata_objects> $<TARGET_OBJECTS:monosgen-objects>)
 set_target_properties(monosgen-static PROPERTIES OUTPUT_NAME ${MONO_LIB_NAME})
+target_link_libraries(monosgen-static PRIVATE dn-containers)
 
 if(DISABLE_COMPONENTS OR AOT_COMPONENTS)
   # add component fallback stubs into static mono library when components have been disabled.
@@ -366,9 +359,9 @@ if(NOT DISABLE_SHARED_LIBS)
     set_target_properties(monosgen-shared PROPERTIES INSTALL_RPATH "$ORIGIN")
   endif()
   if(HOST_WIN32)
-    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects_shared sgen_objects_shared metadata_objects_shared)
+    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects_shared sgen_objects_shared metadata_objects_shared dn-containers)
   else()
-    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects)
+    target_link_libraries(monosgen-shared PRIVATE monoapi eglib_objects utils_objects sgen_objects metadata_objects dn-containers)
   endif()
   target_include_directories (monosgen-shared PRIVATE monoapi)
   if(TARGET_WIN32)
@@ -541,7 +534,7 @@ if(NOT DISABLE_EXECUTABLES)
       set_target_properties(mono-sgen PROPERTIES INSTALL_RPATH "$ORIGIN")
     endif()
   endif()
-  target_link_libraries(mono-sgen PRIVATE monoapi eglib_api monosgen-static)
+  target_link_libraries(mono-sgen PRIVATE monoapi eglib_api monosgen-static dn-containers)
   if (HOST_WASM)
     target_link_libraries(mono-sgen PRIVATE mono-wasm-nosimd)
   endif()

diff --git a/src/native/containers/CMakeLists.txt b/src/native/containers/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_library(dn-containers OBJECT)
+
+target_sources(dn-containers PRIVATE
+    dn-allocator.c
+    dn-fwd-list.c
+    dn-list.c
+    dn-queue.c
+    dn-umap.c
+    dn-vector.c
+    dn-simdhash.c
+    dn-simdhash-string-ptr.c
+    dn-simdhash-u32-ptr.c
+    dn-simdhash-ptr-ptr.c
+    dn-simdhash-ght-compatible.c
+    dn-simdhash-ptrpair-ptr.c
+)
+
+configure_file(dn-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/dn-config.h)
+
+target_include_directories(dn-containers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_include_directories(dn-containers PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/src/native/containers/containers.cmake b/src/native/containers/containers.cmake
diff --git a/src/native/containers/dn-allocator.h b/src/native/containers/dn-allocator.h
@@ -8,6 +8,8 @@
 #include <stdlib.h>
 #include <memory.h>
 
+EXTERN_C_BEGIN
+
 #define DN_ALLOCATOR_MEM_ALIGN8 8
 #define DN_ALLOCATOR_MEM_ALIGN16 16
 #define DN_ALLOCATOR_MAX_ALIGNMENT DN_ALLOCATOR_MEM_ALIGN16
@@ -104,4 +106,6 @@ dn_allocator_fixed_or_malloc_reset (dn_allocator_fixed_or_malloc_t *allocator);
 #define DN_DEFAULT_ALLOCATOR NULL
 #define DN_DEFAULT_LOCAL_ALLOCATOR(var_name, buffer_size) DN_ALLOCATOR_FIXED_OR_MALLOC (var_name, buffer_size)
 
+EXTERN_C_END
+
 #endif /* __DN_ALLOCATOR_H__ */
diff --git a/src/native/containers/dn-config.h.in b/src/native/containers/dn-config.h.in
@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+#ifndef DN_CONFIG_H
+#define DN_CONFIG_H
+
+#cmakedefine SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@
+
+#endif // DN_CONFIG_H
diff --git a/src/native/containers/dn-fwd-list.h b/src/native/containers/dn-fwd-list.h
@@ -7,6 +7,8 @@
 #include "dn-utils.h"
 #include "dn-allocator.h"
 
+EXTERN_C_BEGIN
+
 typedef int32_t (DN_CALLBACK_CALLTYPE *dn_fwd_list_compare_func_t) (const void *a, const void *b);
 typedef bool (DN_CALLBACK_CALLTYPE *dn_fwd_list_equal_func_t) (const void *a, const void *b);
 typedef void (DN_CALLBACK_CALLTYPE *dn_fwd_list_for_each_func_t) (void *data, void *user_data);
@@ -321,4 +323,6 @@ dn_fwd_list_find (
 	return dn_fwd_list_custom_find (list, data, NULL);
 }
 
+EXTERN_C_END
+
 #endif /* __DN_FWD_LIST_H__ */
diff --git a/src/native/containers/dn-list.h b/src/native/containers/dn-list.h
@@ -7,6 +7,8 @@
 #include "dn-utils.h"
 #include "dn-allocator.h"
 
+EXTERN_C_BEGIN
+
 typedef int32_t (DN_CALLBACK_CALLTYPE *dn_list_compare_func_t) (const void *a, const void *b);
 typedef bool (DN_CALLBACK_CALLTYPE *dn_list_equal_func_t) (const void *a, const void *b);
 typedef void (DN_CALLBACK_CALLTYPE *dn_list_for_each_func_t) (void *data, void *user_data);
@@ -371,4 +373,6 @@ dn_list_find (
 	return dn_list_custom_find (list, data, NULL);
 }
 
+EXTERN_C_END
+
 #endif /* __DN_LIST_H__ */
diff --git a/src/native/containers/dn-queue.h b/src/native/containers/dn-queue.h
@@ -8,6 +8,8 @@
 #include "dn-allocator.h"
 #include "dn-list.h"
 
+EXTERN_C_BEGIN
+
 typedef void (DN_CALLBACK_CALLTYPE *dn_queue_dispose_func_t) (void *data);
 
 typedef struct _dn_queue_t dn_queue_t;
@@ -144,4 +146,6 @@ dn_queue_clear (dn_queue_t *queue)
 	dn_queue_custom_clear (queue, NULL);
 }
 
+EXTERN_C_END
+
 #endif /* __DN_QUEUE_H__ */
diff --git a/src/native/containers/dn-simdhash-ght-compatible.c b/src/native/containers/dn-simdhash-ght-compatible.c
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include <dn-config.h>
 #endif
 #include "dn-simdhash.h"
 

diff --git a/src/native/containers/dn-simdhash-ptr-ptr.c b/src/native/containers/dn-simdhash-ptr-ptr.c
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #ifndef NO_CONFIG_H
-#include <config.h>
+#include <dn-config.h>
 #endif
 #include "dn-simdhash.h"
 

diff --git a/src/native/containers/dn-simdhash-ptrpair-ptr.c b/src/native/containers/dn-simdhash-ptrpair-ptr.c
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#include <config.h>
+#include <dn-config.h>
 #include "dn-simdhash.h"
 
 #include "dn-simdhash-utils.h"