diff options
Diffstat (limited to 'src/mbgl/actor')
-rw-r--r-- | src/mbgl/actor/mailbox.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/actor/scheduler.cpp | 11 |
2 files changed, 18 insertions, 5 deletions
diff --git a/src/mbgl/actor/mailbox.cpp b/src/mbgl/actor/mailbox.cpp index dfe0520790..070e14bdb0 100644 --- a/src/mbgl/actor/mailbox.cpp +++ b/src/mbgl/actor/mailbox.cpp @@ -27,7 +27,7 @@ void Mailbox::open(Scheduler& scheduler_) { } if (!queue.empty()) { - (*scheduler)->schedule(shared_from_this()); + (*scheduler)->schedule(makeClosure(shared_from_this())); } } @@ -57,7 +57,7 @@ void Mailbox::push(std::unique_ptr<Message> message) { bool wasEmpty = queue.empty(); queue.push(std::move(message)); if (wasEmpty && scheduler) { - (*scheduler)->schedule(shared_from_this()); + (*scheduler)->schedule(makeClosure(shared_from_this())); } } @@ -84,14 +84,20 @@ void Mailbox::receive() { (*message)(); if (!wasEmpty) { - (*scheduler)->schedule(shared_from_this()); + (*scheduler)->schedule(makeClosure(shared_from_this())); } } +// static void Mailbox::maybeReceive(std::weak_ptr<Mailbox> mailbox) { if (auto locked = mailbox.lock()) { locked->receive(); } } +// static +std::function<void()> Mailbox::makeClosure(std::weak_ptr<Mailbox> mailbox) { + return [mailbox]() { maybeReceive(mailbox); }; +} + } // namespace mbgl diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp index cb0c7728ec..81e259fe1f 100644 --- a/src/mbgl/actor/scheduler.cpp +++ b/src/mbgl/actor/scheduler.cpp @@ -4,7 +4,14 @@ namespace mbgl { -util::ThreadLocal<Scheduler> g_currentScheduler; +std::function<void()> Scheduler::bindOnce(std::function<void()> fn) { + assert(fn); + return [scheduler = makeWeakPtr(), scheduled = std::move(fn)]() mutable { + if (!scheduled) return; // Repeated call. + auto schedulerGuard = scheduler.lock(); + if (scheduler) scheduler->schedule(std::move(scheduled)); + }; +} static auto& current() { static util::ThreadLocal<Scheduler> scheduler; @@ -28,7 +35,7 @@ std::shared_ptr<Scheduler> Scheduler::GetBackground() { std::shared_ptr<Scheduler> scheduler = weak.lock(); if (!scheduler) { - weak = scheduler = std::make_shared<ThreadPool>(4); + weak = scheduler = std::make_shared<ThreadPool>(); } return scheduler; |