Optimizations.

Author: dchapyshev

source/base/threading/asio_event_dispatcher.cc

@@ -32,9 +32,13 @@ namespace base {
 
 namespace {
 
-const size_t kReservedSizeForTimersMap = 100;
+const size_t kReservedSizeForTimersMap = 50;
 const float kLoadFactorForTimersMap = 0.5;
 
+#if defined(Q_OS_WINDOWS)
+const size_t kReservedSizeForEvents = 20;
+#endif // defined(Q_OS_WINDOWS)
+
 } // namespace
 
 //--------------------------------------------------------------------------------------------------
@@ -47,6 +51,10 @@ AsioEventDispatcher::AsioEventDispatcher(QObject* parent)
 
     timers_.reserve(kReservedSizeForTimersMap);
     timers_.max_load_factor(kLoadFactorForTimersMap);
+
+#if defined(Q_OS_WINDOWS)
+    events_.reserve(kReservedSizeForEvents);
+#endif // defined(Q_OS_WINDOWS)
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -191,7 +199,7 @@ int AsioEventDispatcher::remainingTime(int id)
 }
 
 //--------------------------------------------------------------------------------------------------
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINDOWS)
 bool AsioEventDispatcher::registerEventNotifier(QWinEventNotifier* notifier)
 {
     HANDLE handle = notifier->handle();
@@ -212,10 +220,10 @@ bool AsioEventDispatcher::registerEventNotifier(QWinEventNotifier* notifier)
     events_.emplace_back(notifier, wait_handle);
     return true;
 }
-#endif // defined(Q_OS_WIN)
+#endif // defined(Q_OS_WINDOWS)
 
 //--------------------------------------------------------------------------------------------------
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINDOWS)
 void AsioEventDispatcher::unregisterEventNotifier(QWinEventNotifier* notifier)
 {
     auto it = events_.begin();
@@ -234,13 +242,13 @@ void AsioEventDispatcher::unregisterEventNotifier(QWinEventNotifier* notifier)
         }
     }
 }
-#endif // defined(Q_OS_WIN)
+#endif // defined(Q_OS_WINDOWS)
 
 //--------------------------------------------------------------------------------------------------
 void AsioEventDispatcher::wakeUp()
 {
     // To stop run_one inside method processEvents completes.
-    io_context_.stop();
+    asio::post(io_context_, []{});
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -323,7 +331,7 @@ void AsioEventDispatcher::asyncWaitForNextTimer()
             return;
 
         TimerData& timer = it->second;
-        timer.start_time = Clock::now();
+        timer.start_time = timer.expire_time;
         timer.expire_time = timer.start_time + Milliseconds(timer.interval);
 
         asyncWaitForNextTimer();

source/base/threading/asio_event_dispatcher.h

@@ -79,7 +79,7 @@ class AsioEventDispatcher final : public QAbstractEventDispatcher
         TimePoint expire_time;
     };
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WINDOWS)
     struct EventData
     {
         QWinEventNotifier* notifier;
@@ -88,23 +88,15 @@ class AsioEventDispatcher final : public QAbstractEventDispatcher
 
     static void CALLBACK eventCallback(PVOID parameter, BOOLEAN timer_or_wait_fired);
 
-    std::list<EventData> events_;
-#endif // defined(Q_OS_WIN)
+    std::vector<EventData> events_;
+#endif // defined(Q_OS_WINDOWS)
 
     void asyncWaitForNextTimer();
 
-    struct FastHash
-    {
-        size_t operator()(int timer_id) const noexcept
-        {
-            return static_cast<size_t>(timer_id);
-        }
-    };
-
     asio::io_context io_context_;
     asio::executor_work_guard<asio::io_context::executor_type> work_guard_;
     std::atomic_bool interrupted_ { false };
-    std::unordered_map<int, TimerData, FastHash> timers_;
+    std::unordered_map<int, TimerData> timers_;
     asio::high_resolution_timer high_resolution_timer_;
 
     DISALLOW_COPY_AND_ASSIGN(AsioEventDispatcher);