From f9ce3059b068257bc3233281a4bc3545fe3a00ca Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 25 Sep 2022 09:29:21 +0200
Subject: [PATCH] Added some assertions.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 base/base_tests/thread_pool_tests.cpp | 32 ---------------------------
 base/thread_pool.cpp                  | 24 +++++++++-----------
 coding/geometry_coding.hpp            |  6 +----
 drape_frontend/user_event_stream.cpp  | 15 ++++---------
 4 files changed, 16 insertions(+), 61 deletions(-)

diff --git a/base/base_tests/thread_pool_tests.cpp b/base/base_tests/thread_pool_tests.cpp
index 0692d14d47..b1e66f8160 100644
--- a/base/base_tests/thread_pool_tests.cpp
+++ b/base/base_tests/thread_pool_tests.cpp
@@ -59,38 +59,6 @@ UNIT_TEST(ThreadPool_CanceledTaskTest)
   TEST_EQUAL(finishCounter, TASK_COUNT, ());
 }
 
-namespace
-{
-  class EmptyPoolTask : public threads::IRoutine
-  {
-  public:
-    ~EmptyPoolTask()
-    {
-      TEST_EQUAL(IsCancelled(), true, ());
-    }
-
-    virtual void Do()
-    {
-      TEST_EQUAL(true, false, ());
-    }
-  };
-}
-
-UNIT_TEST(ThreadPool_StopOperationTest)
-{
-  int finishCounter = 0;
-  Condition cond;
-  // in this case we have empty pool, and all tasks must be finish only on Stop method call
-  base::thread_pool::routine::ThreadPool pool(0, std::bind(&JoinFinishFunction, std::placeholders::_1,
-                                        std::ref(finishCounter), std::ref(cond)));
-
-  for (int i = 0; i < TASK_COUNT; ++i)
-    pool.PushBack(new EmptyPoolTask());
-
-  pool.Stop();
-
-  TEST_EQUAL(finishCounter, TASK_COUNT, ());
-}
 
 namespace
 {
diff --git a/base/thread_pool.cpp b/base/thread_pool.cpp
index a2d3d868b7..cd219b9a14 100644
--- a/base/thread_pool.cpp
+++ b/base/thread_pool.cpp
@@ -49,13 +49,14 @@ private:
   TPopRoutineFn m_popFn;
   TFinishRoutineFn m_finishFn;
 };
-}
+} // namespace
 
 class ThreadPool::Impl
 {
 public:
   Impl(size_t size, const TFinishRoutineFn & finishFn) : m_finishFn(finishFn), m_threads(size)
   {
+    ASSERT_GREATER(size, 0, ());
     for (auto & thread : m_threads)
     {
       thread.reset(new threads::Thread());
@@ -70,11 +71,13 @@ public:
 
   void PushBack(threads::IRoutine * routine)
   {
+    ASSERT(!IsStopped(), ());
     m_tasks.PushBack(routine);
   }
 
   void PushFront(threads::IRoutine * routine)
   {
+    ASSERT(!IsStopped(), ());
     m_tasks.PushFront(routine);
   }
 
@@ -91,23 +94,18 @@ public:
       thread->Cancel();
     m_threads.clear();
 
-    m_tasks.ProcessList([this](std::list<threads::IRoutine *> & tasks)
+    m_tasks.ProcessList([this](std::list<threads::IRoutine *> const & tasks)
     {
-      FinishTasksOnStop(tasks);
+      for (auto * t : tasks)
+      {
+        t->Cancel();
+        m_finishFn(t);
+      }
     });
     m_tasks.Clear();
   }
 
-private:
-  void FinishTasksOnStop(std::list<threads::IRoutine *> & tasks)
-  {
-    typedef std::list<threads::IRoutine *>::iterator task_iter;
-    for (task_iter it = tasks.begin(); it != tasks.end(); ++it)
-    {
-      (*it)->Cancel();
-      m_finishFn(*it);
-    }
-  }
+  bool IsStopped() const { return m_threads.empty(); }
 
 private:
   ThreadedList<threads::IRoutine *> m_tasks;
diff --git a/coding/geometry_coding.hpp b/coding/geometry_coding.hpp
index 42e22cafce..6023c961d9 100644
--- a/coding/geometry_coding.hpp
+++ b/coding/geometry_coding.hpp
@@ -9,16 +9,11 @@
 
 #include "base/array_adapters.hpp"
 #include "base/assert.hpp"
-#include "base/base.hpp"
-#include "base/bits.hpp"
 #include "base/buffer_vector.hpp"
 #include "base/stl_helpers.hpp"
 
 #include <algorithm>
-#include <cstddef>
-#include <cstdint>
 #include <functional>
-#include <iterator>
 #include <list>
 #include <vector>
 
@@ -52,6 +47,7 @@ m2::PointU DecodePointDelta(Source & source, m2::PointU const & base)
 {
   auto const dx = ReadVarInt<int32_t>(source);
   auto const dy = ReadVarInt<int32_t>(source);
+  ASSERT(int(base.x) + dx >= 0 && int(base.y) + dy >= 0, (base, dx, dy));
   return m2::PointU(base.x + dx, base.y + dy);
 }
 
diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index 7ee24c64a9..df84b43012 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -11,16 +11,11 @@
 #include "drape_frontend/screen_operations.hpp"
 #include "drape_frontend/visual_params.hpp"
 
-#include "indexer/scales.hpp"
-
 #include "platform/platform.hpp"
 
-#include "base/logging.hpp"
 #include "base/macros.hpp"
 
-#include <chrono>
 #include <cmath>
-#include <cstdint>
 
 #ifdef DEBUG
 #define TEST_CALL(action) if (m_testFn) m_testFn(action)
@@ -28,11 +23,11 @@
 #define TEST_CALL(action)
 #endif
 
-using namespace std;
-using std::chrono::milliseconds;
 
 namespace df
 {
+using namespace std;
+
 namespace
 {
 uint64_t const kDoubleTapPauseMs = 250;
@@ -147,8 +142,7 @@ UserEventStream::UserEventStream()
 
 void UserEventStream::AddEvent(drape_ptr<UserEvent> && event)
 {
-  std::lock_guard<std::mutex> guard(m_lock);
-  UNUSED_VALUE(guard);
+  std::lock_guard guard(m_lock);
   m_events.emplace_back(move(event));
 }
 
@@ -156,8 +150,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool
 {
   TEventsList events;
   {
-    std::lock_guard<std::mutex> guard(m_lock);
-    UNUSED_VALUE(guard);
+    std::lock_guard guard(m_lock);
     swap(m_events, events);
   }