diff options
28 files changed, 32 insertions, 28 deletions
diff --git a/benchmark/api/query.benchmark.cpp b/benchmark/api/query.benchmark.cpp index f9f6d3eabd..dce878ea65 100644 --- a/benchmark/api/query.benchmark.cpp +++ b/benchmark/api/query.benchmark.cpp @@ -4,7 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> diff --git a/bin/render.cpp b/bin/render.cpp index 22668e2dc1..c0348af759 100644 --- a/bin/render.cpp +++ b/bin/render.cpp @@ -5,7 +5,7 @@ #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #pragma GCC diagnostic push diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index c4a28524b1..a49b8e5348 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -141,7 +141,6 @@ set(MBGL_CORE_FILES include/mbgl/platform/default/headless_backend.hpp include/mbgl/platform/default/headless_display.hpp include/mbgl/platform/default/offscreen_view.hpp - include/mbgl/platform/default/thread_pool.hpp # programs src/mbgl/programs/attributes.hpp diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 1af81d6841..5e37d13e60 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -56,11 +56,12 @@ macro(mbgl_platform_core) # TODO # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_include_directories(mbgl-core - PRIVATE platform/default + PUBLIC platform/default ) target_add_mason_package(mbgl-core PUBLIC sqlite) diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp index 14b9842c72..35c0307539 100755 --- a/platform/android/src/native_map_view.hpp +++ b/platform/android/src/native_map_view.hpp @@ -4,7 +4,7 @@ #include <mbgl/map/view.hpp> #include <mbgl/map/backend.hpp> #include <mbgl/util/noncopyable.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <string> diff --git a/platform/default/thread_pool.cpp b/platform/default/mbgl/util/default_thread_pool.cpp index b7e02db157..92c0f06745 100644 --- a/platform/default/thread_pool.cpp +++ b/platform/default/mbgl/util/default_thread_pool.cpp @@ -1,4 +1,4 @@ -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/actor/mailbox.hpp> namespace mbgl { diff --git a/include/mbgl/platform/default/thread_pool.hpp b/platform/default/mbgl/util/default_thread_pool.hpp index a14d16d771..a14d16d771 100644 --- a/include/mbgl/platform/default/thread_pool.hpp +++ b/platform/default/mbgl/util/default_thread_pool.hpp diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 6e4b324c43..e3c36dfbb8 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -4,7 +4,7 @@ #include <mbgl/util/default_styles.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/platform/platform.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <signal.h> diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index a24d70fd81..56cb5344ae 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -48,7 +48,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 45ff2f826f..be4e25b46e 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -14,7 +14,7 @@ #include <mbgl/map/mode.hpp> #include <mbgl/platform/platform.hpp> #include <mbgl/storage/reachability.h> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/style/transition_options.hpp> diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 94830e6d26..312577a185 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -82,7 +82,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_include_directories(mbgl-core diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index b608d3b2dd..13b434117f 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -48,7 +48,8 @@ macro(mbgl_platform_core) PRIVATE platform/default/offscreen_view.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp ) target_add_mason_package(mbgl-core PUBLIC geojson) diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 288ed68d62..0feaa3d306 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -22,7 +22,7 @@ #import <mbgl/annotation/annotation.hpp> #import <mbgl/map/camera.hpp> #import <mbgl/storage/reachability.h> -#import <mbgl/platform/default/thread_pool.hpp> +#import <mbgl/util/default_thread_pool.hpp> #import <mbgl/gl/extension.hpp> #import <mbgl/gl/context.hpp> #import <mbgl/map/backend.hpp> diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 76c1d691d0..cb284afcf3 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -31,7 +31,8 @@ set(MBGL_QT_FILES PRIVATE platform/default/log_stderr.cpp # Thread pool - PRIVATE platform/default/thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/mbgl/util/default_thread_pool.cpp # Platform integration PRIVATE platform/qt/src/async_task.cpp diff --git a/platform/qt/src/qmapboxgl_p.hpp b/platform/qt/src/qmapboxgl_p.hpp index e7a14601c1..edff728dd4 100644 --- a/platform/qt/src/qmapboxgl_p.hpp +++ b/platform/qt/src/qmapboxgl_p.hpp @@ -5,7 +5,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/map/backend.hpp> #include <mbgl/map/view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/geo.hpp> diff --git a/test/actor/actor.test.cpp b/test/actor/actor.test.cpp index c24d0b6c25..03f41a6e64 100644 --- a/test/actor/actor.test.cpp +++ b/test/actor/actor.test.cpp @@ -1,5 +1,5 @@ #include <mbgl/actor/actor.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/test/util.hpp> diff --git a/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp index 4be714278e..78721c965e 100644 --- a/test/actor/actor_ref.test.cpp +++ b/test/actor/actor_ref.test.cpp @@ -1,5 +1,5 @@ #include <mbgl/actor/actor.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/test/util.hpp> diff --git a/test/api/annotations.test.cpp b/test/api/annotations.test.cpp index 458ac3f13e..a06567301f 100644 --- a/test/api/annotations.test.cpp +++ b/test/api/annotations.test.cpp @@ -1,7 +1,7 @@ #include <mbgl/test/util.hpp> #include <mbgl/test/stub_file_source.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/annotation/annotation.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/map/map.hpp> diff --git a/test/api/api_misuse.test.cpp b/test/api/api_misuse.test.cpp index f96bf78612..d280514499 100644 --- a/test/api/api_misuse.test.cpp +++ b/test/api/api_misuse.test.cpp @@ -6,7 +6,7 @@ #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> #include <mbgl/storage/online_file_source.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/exception.hpp> #include <mbgl/util/run_loop.hpp> diff --git a/test/api/custom_layer.test.cpp b/test/api/custom_layer.test.cpp index 9287f02189..e58fd0a686 100644 --- a/test/api/custom_layer.test.cpp +++ b/test/api/custom_layer.test.cpp @@ -4,7 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/style/layers/custom_layer.hpp> #include <mbgl/style/layers/fill_layer.hpp> diff --git a/test/api/query.test.cpp b/test/api/query.test.cpp index 506464ea1a..a25e4df310 100644 --- a/test/api/query.test.cpp +++ b/test/api/query.test.cpp @@ -1,7 +1,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/test/stub_file_source.hpp> #include <mbgl/test/util.hpp> diff --git a/test/api/render_missing.test.cpp b/test/api/render_missing.test.cpp index 8f7821205b..b209713d0c 100644 --- a/test/api/render_missing.test.cpp +++ b/test/api/render_missing.test.cpp @@ -4,7 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/io.hpp> diff --git a/test/api/repeated_render.test.cpp b/test/api/repeated_render.test.cpp index 67670916fc..a50fb4c6b6 100644 --- a/test/api/repeated_render.test.cpp +++ b/test/api/repeated_render.test.cpp @@ -4,7 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/storage/default_file_source.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/io.hpp> diff --git a/test/map/map.test.cpp b/test/map/map.test.cpp index 682060324e..b945b5e898 100644 --- a/test/map/map.test.cpp +++ b/test/map/map.test.cpp @@ -6,7 +6,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/sprite/sprite_image.hpp> #include <mbgl/storage/network_status.hpp> #include <mbgl/storage/default_file_source.hpp> diff --git a/test/style/source.test.cpp b/test/style/source.test.cpp index 8d650ed17b..e40089c09f 100644 --- a/test/style/source.test.cpp +++ b/test/style/source.test.cpp @@ -11,7 +11,7 @@ #include <mbgl/util/string.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/tileset.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/map/transform.hpp> diff --git a/test/tile/raster_tile.test.cpp b/test/tile/raster_tile.test.cpp index 2a15fd1b99..0d599ceae0 100644 --- a/test/tile/raster_tile.test.cpp +++ b/test/tile/raster_tile.test.cpp @@ -3,7 +3,7 @@ #include <mbgl/tile/raster_tile.hpp> #include <mbgl/tile/tile_loader_impl.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp index c07db42c3c..210422feec 100644 --- a/test/tile/vector_tile.test.cpp +++ b/test/tile/vector_tile.test.cpp @@ -3,7 +3,7 @@ #include <mbgl/tile/vector_tile.hpp> #include <mbgl/tile/tile_loader_impl.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/map/transform.hpp> #include <mbgl/style/style.hpp> diff --git a/test/util/memory.test.cpp b/test/util/memory.test.cpp index bd67e2c26b..420967bdf4 100644 --- a/test/util/memory.test.cpp +++ b/test/util/memory.test.cpp @@ -4,7 +4,7 @@ #include <mbgl/map/map.hpp> #include <mbgl/platform/default/headless_backend.hpp> #include <mbgl/platform/default/offscreen_view.hpp> -#include <mbgl/platform/default/thread_pool.hpp> +#include <mbgl/util/default_thread_pool.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> |