Remove an assertion when removing channels (#195)

Author: an-tao

trantor/net/Channel.cc

@@ -53,6 +53,8 @@ void Channel::update()
 void Channel::handleEvent()
 {
     // LOG_TRACE<<"revents_="<<revents_;
+    if (events_ == kNoneEvent)
+        return;
     if (tied_)
     {
         std::shared_ptr<void> guard = tie_.lock();

trantor/net/EventLoop.cc

@@ -136,13 +136,6 @@ void EventLoop::removeChannel(Channel *channel)
 {
     assert(channel->ownerLoop() == this);
     assertInLoopThread();
-    if (eventHandling_)
-    {
-        assert(currentActiveChannel_ == channel ||
-               std::find(activeChannels_.begin(),
-                         activeChannels_.end(),
-                         channel) == activeChannels_.end());
-    }
     poller_->removeChannel(channel);
 }
 void EventLoop::quit()

trantor/net/TcpServer.cc

@@ -165,14 +165,26 @@ void TcpServer::stop()
 void TcpServer::connectionClosed(const TcpConnectionPtr &connectionPtr)
 {
     LOG_TRACE << "connectionClosed";
-    // loop_->assertInLoopThread();
-    loop_->runInLoop([this, connectionPtr]() {
+    if (loop_->isInLoopThread())
+    {
         size_t n = connSet_.erase(connectionPtr);
         (void)n;
         assert(n == 1);
-    });
-
-    static_cast<TcpConnectionImpl *>(connectionPtr.get())->connectDestroyed();
+        loop_->queueInLoop([connectionPtr]() {
+            static_cast<TcpConnectionImpl *>(connectionPtr.get())
+                ->connectDestroyed();
+        });
+    }
+    else
+    {
+        loop_->queueInLoop([this, connectionPtr]() {
+            size_t n = connSet_.erase(connectionPtr);
+            (void)n;
+            assert(n == 1);
+            static_cast<TcpConnectionImpl *>(connectionPtr.get())
+                ->connectDestroyed();
+        });
+    }
 }
 
 const std::string TcpServer::ipPort() const