Shove thread_pool to core

2023-09-06 17:19:38 -04:00 · 2023-09-06 17:19:38 -04:00 · 4d77fd48ef
parent 3c5052c1ac
commit 4d77fd48ef
26 changed files with 20 additions and 60 deletions
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@ -61,17 +61,6 @@ install( TARGETS lib_kicad
    )
 endif()

-# Build a single library for the thread pool that we can link around
-
-add_library( threadpool STATIC
-    thread_pool.cpp
-    )
-
-target_include_directories( threadpool PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
-
 # The build version string defaults to the value in the KiCadVersion.cmake file.
 # If being built inside a git repository, the git tag and commit hash are used to create
 # a new version string instead. The user can supply an additional string to be appended
@ -517,7 +506,6 @@ target_link_libraries( common
    dxflib_qcad
    tinyspline_lib
    scripting
-    threadpool
    nlohmann_json
    pybind11::embed
    compoundfilereader
@ -544,7 +532,6 @@ target_include_directories( common
    PUBLIC
        .
        ${CMAKE_BINARY_DIR}
-        $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
        $<TARGET_PROPERTY:argparse::argparse,INTERFACE_INCLUDE_DIRECTORIES>
    )

@ -650,16 +637,14 @@ set_source_files_properties( ${PCB_COMMON_SRCS} PROPERTIES
 add_library( pcbcommon STATIC ${PCB_COMMON_SRCS} )

 target_include_directories( pcbcommon PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
    )

 target_link_libraries( pcbcommon PUBLIC
+    core
    common
    delaunator
    kimath
    kiplatform
-    core
-    threadpool
 )

 message( STATUS "Including 3Dconnexion SpaceMouse navigation support in pcbcommon" )
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@ -48,7 +48,7 @@

 #include <macros.h>
 #include <geometry/geometry_utils.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>

 #include <profile.h>
 #include <trace_helpers.h>
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@ -66,7 +66,7 @@
 #include <settings/common_settings.h>
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <trace_helpers.h>

 #include <widgets/wx_splash.h>
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@ -78,10 +78,6 @@ target_link_libraries( cvpcb_kiface
    ${wxWidgets_LIBRARIES}
    )

-target_include_directories( cvpcb_kiface PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
 # -lrt must follow Boost on Linux platforms
 target_link_libraries( cvpcb_kiface $<$<BOOL:${UNIX_NOT_APPLE}>:rt> )

--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@ -513,7 +513,6 @@ target_include_directories( eeschema_kiface_objects
    PUBLIC
        .
        netlist_exporters
-        $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
     )

 target_link_libraries( eeschema_kiface_objects
--- a/eeschema/connection_graph.cpp
+++ b/eeschema/connection_graph.cpp
@ -45,7 +45,7 @@
 #include <project/net_settings.h>
 #include <widgets/ui_common.h>
 #include <string_utils.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <wx/log.h>

 #include <advanced_config.h> // for realtime connectivity switch in release builds
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@ -124,10 +124,6 @@ target_link_libraries( gerbview
    ${wxWidgets_LIBRARIES}
    )

-target_include_directories( gerbview PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
 target_link_options( gerbview PRIVATE
    $<$<BOOL:${KICAD_MAKE_LINK_MAPS}>:-Wl,--cref,-Map=gerbview.map>
    )
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@ -157,14 +157,6 @@ endif()
 target_link_libraries( kicad pcm )
 target_link_libraries( kicad-cli pcm )

-target_include_directories( kicad PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
-target_include_directories( kicad-cli PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
 install( TARGETS kicad
    DESTINATION ${KICAD_BIN}
    COMPONENT binary
--- a/libs/core/CMakeLists.txt
+++ b/libs/core/CMakeLists.txt
@ -6,6 +6,7 @@ endif()


 add_library( core STATIC
+    thread_pool.cpp
    version_compare.cpp
    wx_stl_compat.cpp
 )
@ -16,4 +17,5 @@ target_link_libraries( core PUBLIC

 target_include_directories( core PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
 )
--- a/libs/core/include/core/thread_pool.h
+++ b/libs/core/include/core/thread_pool.h
--- a/libs/core/thread_pool.cpp
+++ b/libs/core/thread_pool.cpp
@ -22,7 +22,7 @@
 */


-#include <thread_pool.h>
+#include <core/thread_pool.h>

 // Under mingw, there is a problem with the destructor when creating a static instance
 // of a thread_pool: probably the DTOR is called too late, and the application hangs.
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@ -117,10 +117,6 @@ set_target_properties( pl_editor_kiface PROPERTIES
    SUFFIX          ${KIFACE_SUFFIX}
    )

-target_include_directories( pl_editor_kiface PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
 set_source_files_properties( pl_editor.cpp PROPERTIES
    # The KIFACE is in pcbnew.cpp, export it:
    COMPILE_DEFINITIONS     "BUILD_KIWAY_DLL;COMPILING_DLL"
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@ -630,10 +630,6 @@ target_link_libraries( pcbnew_kiface_objects
        ${OCC_LIBRARIES}
    )

-target_include_directories( pcbnew_kiface_objects PRIVATE
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
-    )
-
 add_library( pcbnew_kiface MODULE )

 set_target_properties( pcbnew_kiface PROPERTIES
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@ -59,7 +59,7 @@
 #include <reporter.h>
 #include <tool/selection_conditions.h>
 #include <string_utils.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <zone.h>

 // This is an odd place for this, but CvPcb won't link if it's in board_item.cpp like I first
--- a/pcbnew/connectivity/CMakeLists.txt
+++ b/pcbnew/connectivity/CMakeLists.txt
@ -4,7 +4,6 @@ include_directories(
    ./
    ../
    ../../include
-    $<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
    ${INC_AFTER}
 )

@ -19,5 +18,4 @@ add_library( connectivity STATIC ${PCBNEW_CONN_SRCS} )

 target_link_libraries( connectivity PRIVATE
    common
-    threadpool    
 )
--- a/pcbnew/connectivity/connectivity_algo.cpp
+++ b/pcbnew/connectivity/connectivity_algo.cpp
@ -33,7 +33,7 @@
 #include <progress_reporter.h>
 #include <geometry/geometry_utils.h>
 #include <board_commit.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <pcb_shape.h>

 #include <wx/log.h>
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@ -40,7 +40,7 @@
 #include <geometry/shape_circle.h>
 #include <ratsnest/ratsnest_data.h>
 #include <progress_reporter.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <trigo.h>
 #include <drc/drc_rtree.h>

--- a/pcbnew/drc/drc_cache_generator.cpp
+++ b/pcbnew/drc/drc_cache_generator.cpp
@ -24,7 +24,7 @@
 #include <common.h>
 #include <board_design_settings.h>
 #include <footprint.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <zone.h>
 #include <connectivity/connectivity_data.h>
 #include <drc/drc_engine.h>
--- a/pcbnew/drc/drc_engine.cpp
+++ b/pcbnew/drc/drc_engine.cpp
@ -39,7 +39,7 @@
 #include <footprint.h>
 #include <pad.h>
 #include <pcb_track.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <zone.h>


--- a/pcbnew/drc/drc_test_provider_connection_width.cpp
+++ b/pcbnew/drc/drc_test_provider_connection_width.cpp
@ -44,7 +44,7 @@
 #include <math/vector2d.h>
 #include <pcb_shape.h>
 #include <progress_reporter.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <pcb_track.h>
 #include <pad.h>
 #include <zone.h>
--- a/pcbnew/drc/drc_test_provider_copper_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_copper_clearance.cpp
@ -28,7 +28,7 @@
 #include <pcb_shape.h>
 #include <pad.h>
 #include <pcb_track.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <zone.h>

 #include <geometry/seg.h>
--- a/pcbnew/drc/drc_test_provider_disallow.cpp
+++ b/pcbnew/drc/drc_test_provider_disallow.cpp
@ -31,7 +31,7 @@
 #include <drc/drc_test_provider.h>
 #include <pad.h>
 #include <progress_reporter.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <zone.h>


--- a/pcbnew/drc/drc_test_provider_sliver_checker.cpp
+++ b/pcbnew/drc/drc_test_provider_sliver_checker.cpp
@ -33,7 +33,7 @@
 #include <drc/drc_test_provider.h>
 #include <advanced_config.h>
 #include <progress_reporter.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>

 /*
    Checks for slivers in copper layers
--- a/pcbnew/drc/drc_test_provider_zone_connections.cpp
+++ b/pcbnew/drc/drc_test_provider_zone_connections.cpp
@ -28,7 +28,7 @@
 #include <footprint.h>
 #include <pad.h>
 #include <pcb_track.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>

 #include <geometry/shape_line_chain.h>
 #include <geometry/shape_poly_set.h>
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@ -31,7 +31,7 @@
 #include <lib_id.h>
 #include <progress_reporter.h>
 #include <string_utils.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <wildcards_and_files_ext.h>

 #include <kiplatform/io.h>
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@ -43,7 +43,7 @@
 #include <geometry/convex_hull.h>
 #include <geometry/geometry_utils.h>
 #include <confirm.h>
-#include <thread_pool.h>
+#include <core/thread_pool.h>
 #include <math/util.h>      // for KiROUND
 #include "zone_filler.h"