[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`.
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user