From 88be996edabaaa45c786fe28d2b1e755e2f7907b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 8 Sep 2019 15:08:48 -0700 Subject: revert threadpool change --- src/mbgl/actor/scheduler.cpp | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/mbgl/actor/scheduler.cpp b/src/mbgl/actor/scheduler.cpp index fa5127387c..fd48454880 100644 --- a/src/mbgl/actor/scheduler.cpp +++ b/src/mbgl/actor/scheduler.cpp @@ -22,21 +22,17 @@ Scheduler* Scheduler::GetCurrent() { // static std::shared_ptr Scheduler::GetBackground() { - // static std::weak_ptr weak; - // static std::mutex mtx; - // - // std::lock_guard lock(mtx); - // std::shared_ptr scheduler = weak.lock(); - // - // if (!scheduler) { - // std::clog << "creating scheduler\n"; - // weak = scheduler = std::make_shared(4); - // } else { - // std::clog << "re-using scheduler\n"; - // } - // - // return scheduler; - return std::make_shared(2); + static std::weak_ptr weak; + static std::mutex mtx; + + std::lock_guard lock(mtx); + std::shared_ptr scheduler = weak.lock(); + + if (!scheduler) { + //std::clog << "creating scheduler\n"; + weak = scheduler = std::make_shared(4); + } + return scheduler; } } //namespace mbgl -- cgit v1.2.1