<fix>(timer): fix that timer still work after stopping wsService (#103)

FISCO-BCOS · May 22, 2023 · 5d8fb05 · 5d8fb05
1 parent 07d5d79
commit 5d8fb05
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/bcos-boostssl/utility/NewTimer.h b/bcos-boostssl/utility/NewTimer.h
@@ -22,9 +22,9 @@
  */
 #pragma once
 #include "bcos-utilities/BoostLog.h"
+#include "bcos-utilities/Common.h"
 #include <boost/asio.hpp>
 #include <boost/asio/steady_timer.hpp>
-#include "bcos-utilities/Common.h"
 #include <exception>
 
 namespace bcos
@@ -90,6 +90,11 @@ class Timer : public std::enable_shared_from_this<Timer>
             return;
         }
 
+        if (m_ioService)
+        {
+            m_ioService->stop();
+        }
+
         if (m_delayHandler)
         {
             m_delayHandler->cancel();
@@ -99,6 +104,8 @@ class Timer : public std::enable_shared_from_this<Timer>
         {
             m_timerHandler->cancel();
         }
+
+        m_running = false;
     }
 
 private:
@@ -201,10 +208,9 @@ class TimerFactory
         return timer;
     }
 
-private:
     void startThread()
     {
-        if (m_worker)
+        if (m_worker || !m_running)
         {
             return;
         }
@@ -248,7 +254,9 @@ class TimerFactory
         m_running = false;
         BCOS_LOG(INFO) << LOG_BADGE("stopThread") << LOG_DESC("stop the timer thread");
 
+        // must stop ioService, otherwise thread won't stop
         m_ioService->stop();
+
         if (m_worker->get_id() != std::this_thread::get_id())
         {
             m_worker->join();
@@ -260,6 +268,7 @@ class TimerFactory
         }
     }
 
+private:
     std::atomic_bool m_running = {false};
     std::string m_threadName = "timerFactory";
     std::unique_ptr<std::thread> m_worker = nullptr;

diff --git a/bcos-boostssl/websocket/WsService.cpp b/bcos-boostssl/websocket/WsService.cpp
@@ -68,6 +68,7 @@ void WsService::start()
     {
         m_timerFactory = std::make_shared<timer::TimerFactory>();
     }
+    m_timerFactory->startThread();
 
     // start ioc thread
     if (m_ioservicePool)
@@ -133,12 +134,6 @@ void WsService::stop()
     }
     m_running = false;
 
-    // stop ioc thread
-    if (m_ioservicePool)
-    {
-        m_ioservicePool->stop();
-    }
-
     if (m_statTimer)
     {
         m_statTimer->stop();
@@ -149,6 +144,17 @@ void WsService::stop()
         m_reconnectTimer->stop();
     }
 
+    // stop ioc thread
+    if (m_ioservicePool)
+    {
+        m_ioservicePool->stop();
+    }
+
+    if (m_timerFactory)
+    {
+        m_timerFactory->stopThread();
+    }
+
     WEBSOCKET_SERVICE(INFO) << LOG_BADGE("stop") << LOG_DESC("stop websocket service successfully");
 }