Fix SimpleIdentity::isEmpty, increment runningCount early

mwilsnd · Jun 26, 2024 · e51d9e1 · e51d9e1
1 parent 3202788
commit e51d9e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/mbgl/util/identity.hpp b/include/mbgl/util/identity.hpp
@@ -27,7 +27,7 @@ class SimpleIdentity final {
     bool operator!=(const SimpleIdentity& other) const noexcept { return uniqueID != other.uniqueID; }
 
     std::int64_t id() const noexcept { return uniqueID; }
-    bool isEmpty() const noexcept { return uniqueID != emptyID; }
+    bool isEmpty() const noexcept { return uniqueID == emptyID; }
 
     operator bool() const noexcept { return isEmpty(); }
     bool operator!() const noexcept { return !isEmpty(); }

diff --git a/src/mbgl/util/thread_pool.cpp b/src/mbgl/util/thread_pool.cpp
@@ -62,14 +62,14 @@ std::thread ThreadedSchedulerBase::makeSchedulerThread(size_t index) {
                 {
                     std::lock_guard<std::mutex> lock(q->lock);
                     if (q->queue.size()) {
+                        q->runningCount++;
                         tasklet = std::move(q->queue.front());
                         q->queue.pop();
                     }
                     if (!tasklet) continue;
                 }
 
                 assert(taskCount > 0);
-                q->runningCount++;
                 taskCount--;
 
                 try {