summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-09-06 15:01:34 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-09-16 12:01:06 -0700
commit41bbd4e4f7d66465433e370ca024ab0239fcace3 (patch)
tree8fe15fa31d97aafeb175a808e431b437297af88b /cmake
parent0bd66d40ddf9e75f860fe18e7c80de9c840f48ac (diff)
downloadqtlocation-mapboxgl-41bbd4e4f7d66465433e370ca024ab0239fcace3.tar.gz
[core] Use an actor model for tile worker concurrency
Diffstat (limited to 'cmake')
-rw-r--r--cmake/core-files.cmake18
-rw-r--r--cmake/test-files.cmake12
2 files changed, 23 insertions, 7 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 1a7353e979..11300e444d 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -1,6 +1,16 @@
# Do not edit. Regenerate this with ./scripts/generate-core-files.sh
set(MBGL_CORE_FILES
+ # actor
+ src/mbgl/actor/actor.hpp
+ src/mbgl/actor/actor_ref.hpp
+ src/mbgl/actor/mailbox.cpp
+ src/mbgl/actor/mailbox.hpp
+ src/mbgl/actor/message.hpp
+ src/mbgl/actor/scheduler.hpp
+ src/mbgl/actor/thread_pool.cpp
+ src/mbgl/actor/thread_pool.hpp
+
# algorithm
src/mbgl/algorithm/covered_by_children.hpp
src/mbgl/algorithm/generate_clip_ids.cpp
@@ -365,8 +375,12 @@ set(MBGL_CORE_FILES
src/mbgl/tile/geometry_tile.hpp
src/mbgl/tile/geometry_tile_data.cpp
src/mbgl/tile/geometry_tile_data.hpp
+ src/mbgl/tile/geometry_tile_worker.cpp
+ src/mbgl/tile/geometry_tile_worker.hpp
src/mbgl/tile/raster_tile.cpp
src/mbgl/tile/raster_tile.hpp
+ src/mbgl/tile/raster_tile_worker.cpp
+ src/mbgl/tile/raster_tile_worker.hpp
src/mbgl/tile/tile.cpp
src/mbgl/tile/tile.hpp
src/mbgl/tile/tile_cache.cpp
@@ -376,8 +390,6 @@ set(MBGL_CORE_FILES
src/mbgl/tile/tile_loader.hpp
src/mbgl/tile/tile_loader_impl.hpp
src/mbgl/tile/tile_observer.hpp
- src/mbgl/tile/tile_worker.cpp
- src/mbgl/tile/tile_worker.hpp
src/mbgl/tile/vector_tile.cpp
src/mbgl/tile/vector_tile.hpp
@@ -472,6 +484,4 @@ set(MBGL_CORE_FILES
src/mbgl/util/work_queue.cpp
src/mbgl/util/work_queue.hpp
src/mbgl/util/work_request.cpp
- src/mbgl/util/worker.cpp
- src/mbgl/util/worker.hpp
)
diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake
index 0a4a6e3c41..84f9bcca63 100644
--- a/cmake/test-files.cmake
+++ b/cmake/test-files.cmake
@@ -1,6 +1,10 @@
# Do not edit. Regenerate this with ./scripts/generate-test-files.sh
set(MBGL_TEST_FILES
+ # actor
+ test/actor/actor.cpp
+ test/actor/actor_ref.cpp
+
# algorithm
test/algorithm/covered_by_children.cpp
test/algorithm/generate_clip_ids.cpp
@@ -43,10 +47,12 @@ set(MBGL_TEST_FILES
# src/mbgl/test
test/src/mbgl/test/conversion_stubs.hpp
+ test/src/mbgl/test/fake_file_source.hpp
test/src/mbgl/test/fixture_log_observer.cpp
test/src/mbgl/test/fixture_log_observer.hpp
test/src/mbgl/test/stub_file_source.cpp
test/src/mbgl/test/stub_file_source.hpp
+ test/src/mbgl/test/stub_layer_observer.hpp
test/src/mbgl/test/stub_style_observer.hpp
test/src/mbgl/test/test.cpp
test/src/mbgl/test/util.cpp
@@ -63,6 +69,9 @@ set(MBGL_TEST_FILES
test/storage/online_file_source.cpp
test/storage/resource.cpp
+ # style/conversion
+ test/style/conversion/geojson_options.cpp
+
# style
test/style/filter.cpp
test/style/functions.cpp
@@ -73,9 +82,6 @@ set(MBGL_TEST_FILES
test/style/style_parser.cpp
test/style/tile_source.cpp
test/style/variant.cpp
-
- # style conversion
- test/style/conversion/geojson_options.cpp
# text
test/text/quads.cpp