From b820ca4686b923785f359d4e7054a2c47b5faff8 Mon Sep 17 00:00:00 2001 From: Chris Loer Date: Mon, 30 Apr 2018 15:27:28 -0700 Subject: [core] Remove unused 'Throttler' class. Throttler was previously used to control how frequently background placement ran. --- cmake/core-files.cmake | 2 -- src/mbgl/tile/geometry_tile.hpp | 1 - src/mbgl/util/throttler.cpp | 36 ------------------------------------ src/mbgl/util/throttler.hpp | 22 ---------------------- 4 files changed, 61 deletions(-) delete mode 100644 src/mbgl/util/throttler.cpp delete mode 100644 src/mbgl/util/throttler.hpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index d4fec34bf5..0474de4680 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -748,8 +748,6 @@ set(MBGL_CORE_FILES src/mbgl/util/stopwatch.hpp src/mbgl/util/string.cpp src/mbgl/util/thread_local.hpp - src/mbgl/util/throttler.cpp - src/mbgl/util/throttler.hpp src/mbgl/util/tile_coordinate.hpp src/mbgl/util/tile_cover.cpp src/mbgl/util/tile_cover.hpp diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index d0490f1009..af122474c2 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/src/mbgl/util/throttler.cpp b/src/mbgl/util/throttler.cpp deleted file mode 100644 index 910810ce2f..0000000000 --- a/src/mbgl/util/throttler.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#include - -namespace mbgl { -namespace util { - -Throttler::Throttler(Duration frequency_, std::function&& function_) - : frequency(frequency_) - , function(std::move(function_)) - , pendingInvocation(false) - , lastInvocation(TimePoint::min()) -{} - -void Throttler::invoke() { - if (pendingInvocation) { - return; - } - - Duration timeToNextInvocation = lastInvocation == TimePoint::min() - ? Duration::zero() - : (lastInvocation + frequency) - Clock::now(); - - if (timeToNextInvocation <= Duration::zero()) { - lastInvocation = Clock::now(); - function(); - } else { - pendingInvocation = true; - timer.start(timeToNextInvocation, Duration::zero(), [this]{ - pendingInvocation = false; - lastInvocation = Clock::now(); - function(); - }); - } -} - -} // namespace util -} // namespace mbgl diff --git a/src/mbgl/util/throttler.hpp b/src/mbgl/util/throttler.hpp deleted file mode 100644 index 175de7ccaf..0000000000 --- a/src/mbgl/util/throttler.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#include -#include - -namespace mbgl { -namespace util { - -class Throttler { -public: - Throttler(Duration frequency, std::function&& function); - - void invoke(); -private: - Duration frequency; - std::function function; - - Timer timer; - bool pendingInvocation; - TimePoint lastInvocation; -}; - -} // namespace util -} // namespace mbgl -- cgit v1.2.1