Fix a bug when closing connections on Windows/MacOS (#202)

Author: an-tao

trantor/net/TcpServer.cc

@@ -162,30 +162,38 @@ void TcpServer::stop()
         f.get();
     }
 }
-void TcpServer::connectionClosed(const TcpConnectionPtr &connectionPtr)
+void TcpServer::handleCloseInLoop(const TcpConnectionPtr &connectionPtr)
 {
-    LOG_TRACE << "connectionClosed";
-    if (loop_->isInLoopThread())
+    size_t n = connSet_.erase(connectionPtr);
+    (void)n;
+    assert(n == 1);
+    auto connLoop = connectionPtr->getLoop();
+    if (connLoop == loop_)
     {
-        size_t n = connSet_.erase(connectionPtr);
-        (void)n;
-        assert(n == 1);
-        loop_->queueInLoop([connectionPtr]() {
-            static_cast<TcpConnectionImpl *>(connectionPtr.get())
-                ->connectDestroyed();
-        });
+        static_cast<TcpConnectionImpl *>(connectionPtr.get())
+            ->connectDestroyed();
     }
     else
     {
-        loop_->queueInLoop([this, connectionPtr]() {
-            size_t n = connSet_.erase(connectionPtr);
-            (void)n;
-            assert(n == 1);
+        connLoop->queueInLoop([connectionPtr]() {
             static_cast<TcpConnectionImpl *>(connectionPtr.get())
                 ->connectDestroyed();
         });
     }
 }
+void TcpServer::connectionClosed(const TcpConnectionPtr &connectionPtr)
+{
+    LOG_TRACE << "connectionClosed";
+    if (loop_->isInLoopThread())
+    {
+        handleCloseInLoop(connectionPtr);
+    }
+    else
+    {
+        loop_->queueInLoop(
+            [this, connectionPtr]() { handleCloseInLoop(connectionPtr); });
+    }
+}
 
 const std::string TcpServer::ipPort() const
 {

trantor/net/TcpServer.h

@@ -215,6 +215,7 @@ class TRANTOR_EXPORT TcpServer : NonCopyable
 
   private:
     EventLoop *loop_;
+    void handleCloseInLoop(const TcpConnectionPtr &connectionPtr);
     std::unique_ptr<Acceptor> acceptorPtr_;
     void newConnection(int fd, const InetAddress &peer);
     std::string serverName_;