[src] Improve EventManager and ReactorManager

Sigma711 · Aug 11, 2023 · 4fc9587 · 4fc9587
1 parent 7148853
commit 4fc9587
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/event_manager.cc b/src/event_manager.cc
@@ -205,12 +205,12 @@ void EventManager::WakeUp() {
 #endif
 }
 
-void EventManager::Quit() { should_quit_ = true; }
+void EventManager::Quit() { should_quit_.store(true); }
 
 void EventManager::Start() {
-  should_quit_ = false;
+  should_quit_.store(false);
   LOG_DEBUG("The event loop in thread(%lu) is starting.", ::pthread_self());
-  while (!should_quit_) {
+  while (!should_quit_.load()) {
     auto return_time =
         poller_.Poll(timer_.GetMinTimeDuration(),
                      &active_events_);  // Return time is the time point of

diff --git a/src/event_manager.h b/src/event_manager.h
@@ -14,6 +14,7 @@
 
 #include <stdint.h>
 
+#include <atomic>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -125,7 +126,7 @@ class EventManager : NonCopyableMovable {
   mutable MutexLock connection_map_mutex_lock_;
 
   // The flag for deciding whether the event loop should quit
-  bool should_quit_;
+  std::atomic_bool should_quit_;
 
   // List for active events returned from the I/O multiplexing waiting each loop
   Poller::EventerList active_events_;

diff --git a/src/reactor_manager.cc b/src/reactor_manager.cc
@@ -65,7 +65,6 @@ ServerReactorManager::ServerReactorManager(EventManagers* event_managers,
     LOG_ERROR("Fail to init the acceptor!!!");
     ::exit(-1);
   }
-  // TODO: event_managers_[0] = event_managers;
   for (size_t i = 0; i < io_thread_amount; ++i) {
     // "Initialize" "Reactor"s
     (*event_managers_)[i]->SetCreateConnectionCallback(
@@ -82,12 +81,6 @@ ServerReactorManager::ServerReactorManager(EventManagers* event_managers,
   }
   balancer_ = std::make_unique<Balancer>(event_managers_, 0);
 }
-ServerReactorManager::~ServerReactorManager() {
-  // size_t thread_amount = event_managers_.size();
-  // for (size_t i = 1; i < thread_amount; ++i) {
-  //   delete event_managers_[i];
-  // }
-}
 
 void ServerReactorManager::Loop() {
   size_t io_thread_amount = (*event_managers_).size();

diff --git a/src/reactor_manager.h b/src/reactor_manager.h
@@ -49,7 +49,6 @@ class ServerReactorManager : NonCopyableMovable {
                        const NetAddress& listen_address,
                        size_t io_thread_amount = 6,
                        bool should_reuse_port = false);
-  ~ServerReactorManager();
 
   void SetConnectionCallback(const NormalCallback& cb) {
     ConnectionCallback_ = cb;