diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-02-14 16:56:17 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-05-10 14:20:38 +0300 |
commit | 06f1dc48a2fb317979ab48ce323115be5bd48f16 (patch) | |
tree | 5ef1e78a1f98a7a26034ca519e267bda235b2817 /test/actor/actor_ref.test.cpp | |
parent | 947bc75f56fae7f1e70f21b98730dc6b460b9194 (diff) | |
download | qtlocation-mapboxgl-06f1dc48a2fb317979ab48ce323115be5bd48f16.tar.gz |
[core] Make the BackgroundScheduler a singleton
- Do not carry it over everywhere as parameter, it is a shared
instance anyway and the lifecycle is pretty much the app lifecycle
from the moment we instantiate a map.
- Rename to BackgroundScheduler because it is a Scheduler that will
do tasks in the background, we don't make assumptions if it is a
thread pool or a single thread.
- Most importantly, remove the dependency from `core` on `platform`.
Diffstat (limited to 'test/actor/actor_ref.test.cpp')
-rw-r--r-- | test/actor/actor_ref.test.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/actor/actor_ref.test.cpp b/test/actor/actor_ref.test.cpp index 20aa1c35c1..221a220ed9 100644 --- a/test/actor/actor_ref.test.cpp +++ b/test/actor/actor_ref.test.cpp @@ -1,6 +1,6 @@ #include <mbgl/actor/actor.hpp> -#include <mbgl/util/default_thread_pool.hpp> +#include <mbgl/actor/scheduler.hpp> #include <mbgl/test/util.hpp> #include <future> @@ -27,11 +27,10 @@ TEST(ActorRef, CanOutliveActor) { } }; - ThreadPool pool { 1 }; bool died = false; ActorRef<Test> test = [&] () { - return Actor<Test>(pool, std::ref(died)).self(); + return Actor<Test>(Scheduler::GetBackground(), std::ref(died)).self(); }(); EXPECT_TRUE(died); @@ -54,8 +53,7 @@ TEST(ActorRef, Ask) { } }; - ThreadPool pool { 1 }; - Actor<Test> actor(pool); + Actor<Test> actor(Scheduler::GetBackground()); ActorRef<Test> ref = actor.self(); EXPECT_EQ(20, ref.ask(&Test::gimme).get()); @@ -76,9 +74,8 @@ TEST(ActorRef, AskVoid) { } }; - ThreadPool pool { 1 }; bool executed = false; - Actor<Test> actor(pool, executed); + Actor<Test> actor(Scheduler::GetBackground(), executed); ActorRef<Test> ref = actor.self(); ref.ask(&Test::doIt).get(); @@ -104,8 +101,7 @@ TEST(ActorRef, AskOnDestroyedActor) { }; bool died = false; - ThreadPool pool { 1 }; - auto actor = std::make_unique<Actor<Test>>(pool, died); + auto actor = std::make_unique<Actor<Test>>(Scheduler::GetBackground(), died); ActorRef<Test> ref = actor->self(); actor.reset(); |