Give EventLoopThread::loop_ static lifetime (#212)

Author: hwc0919

trantor/net/EventLoop.cc

@@ -165,15 +165,6 @@ void EventLoop::quit()
 {
     quit_.store(true, std::memory_order_release);
 
-    Func f;
-    while (funcsOnQuit_.dequeue(f))
-    {
-        f();
-    }
-
-    // There is a chance that loop() just executes while(!quit_) and exits,
-    // then EventLoop destructs, then we are accessing an invalid object.
-    // Can be fixed using mutex_ in both places.
     if (!isInLoopThread())
     {
         wakeup();
@@ -205,12 +196,18 @@ void EventLoop::loop()
             currentActiveChannel_ = *it;
             currentActiveChannel_->handleEvent();
         }
-        currentActiveChannel_ = NULL;
+        currentActiveChannel_ = nullptr;
         eventHandling_ = false;
         // std::cout << "looping" << endl;
         doRunInLoopFuncs();
     }
     looping_.store(false, std::memory_order_release);
+
+    Func f;
+    while (funcsOnQuit_.dequeue(f))
+    {
+        f();
+    }
 }
 void EventLoop::abortNotInLoopThread()
 {

trantor/net/EventLoopThread.cc

@@ -27,6 +27,7 @@ EventLoopThread::EventLoopThread(const std::string &threadName)
     auto f = promiseForLoopPointer_.get_future();
     loop_ = f.get();
 }
+
 EventLoopThread::~EventLoopThread()
 {
     run();
@@ -39,28 +40,27 @@ EventLoopThread::~EventLoopThread()
         thread_.join();
     }
 }
-// void EventLoopThread::stop() {
-//    if(loop_)
-//        loop_->quit();
-//}
+
 void EventLoopThread::wait()
 {
     thread_.join();
 }
+
 void EventLoopThread::loopFuncs()
 {
 #ifdef __linux__
     ::prctl(PR_SET_NAME, loopThreadName_.c_str());
 #endif
-    EventLoop loop;
+    thread_local static EventLoop loop;
     loop.queueInLoop([this]() { promiseForLoop_.set_value(1); });
     promiseForLoopPointer_.set_value(&loop);
     auto f = promiseForRun_.get_future();
     (void)f.get();
     loop.loop();
     // LOG_DEBUG << "loop out";
-    loop_ = NULL;
+    loop_ = nullptr;
 }
+
 void EventLoopThread::run()
 {
     std::call_once(once_, [this]() {