release pending items before waiting

maplibre · Nov 19, 2024 · 43f1272 · 43f1272
1 parent 877d12b
commit 43f1272
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/mbgl/tile/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp
@@ -8,6 +8,18 @@
 
 namespace mbgl {
 
+TileCache::~TileCache() {
+    MLN_TRACE_FUNC();
+
+    clear();
+    pendingReleases.clear();
+
+    std::unique_lock<std::mutex> counterLock(deferredSignalLock);
+    while (deferredDeletionsPending != 0) {
+        deferredSignal.wait(counterLock);
+    }
+}
+
 void TileCache::setSize(size_t size_) {
     MLN_TRACE_FUNC();
 

diff --git a/src/mbgl/tile/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp
@@ -18,15 +18,7 @@ class TileCache {
     TileCache(const TaggedScheduler& threadPool_, size_t size_ = 0)
         : threadPool(threadPool_),
           size(size_) {}
-
-    ~TileCache() {
-        clear();
-
-        std::unique_lock<std::mutex> counterLock(deferredSignalLock);
-        while (deferredDeletionsPending != 0) {
-            deferredSignal.wait(counterLock);
-        }
-    }
+    ~TileCache();
 
     /// Change the maximum size of the cache.
     void setSize(size_t);