Add stop() method to the TcpServer class (#79)

Author: an-tao

trantor/net/TcpServer.cc

@@ -41,7 +41,7 @@ TcpServer::TcpServer(EventLoop *loop,
 
 TcpServer::~TcpServer()
 {
-    loop_->assertInLoopThread();
+    // loop_->assertInLoopThread();
     LOG_TRACE << "TcpServer::~TcpServer [" << serverName_ << "] destructing";
 }
 
@@ -142,7 +142,20 @@ void TcpServer::start()
         acceptorPtr_->listen();
     });
 }
-
+void TcpServer::stop()
+{
+    loop_->runInLoop([this]() { acceptorPtr_.reset(); });
+    for (auto connection : connSet_)
+    {
+        connection->forceClose();
+    }
+    loopPoolPtr_.reset();
+    for (auto iter : timingWheelMap_)
+    {
+        iter.second.reset();
+    }
+    timingWheelMap_.clear();
+}
 void TcpServer::connectionClosed(const TcpConnectionPtr &connectionPtr)
 {
     LOG_TRACE << "connectionClosed";

trantor/net/TcpServer.h

@@ -39,6 +39,7 @@ class TcpServer : NonCopyable
               bool reUsePort = true);
     ~TcpServer();
     void start();
+    void stop();
     void setIoLoopNum(size_t num)
     {
         assert(!started_);

trantor/net/inner/TcpConnectionImpl.cc

@@ -383,7 +383,9 @@ void TcpConnectionImpl::extendLife()
         auto entry = kickoffEntry_.lock();
         if (entry)
         {
-            timingWheelPtr_->insertEntry(idleTimeout_, entry);
+            auto timingWheelPtr = timingWheelWeakPtr_.lock();
+            if (timingWheelPtr)
+                timingWheelPtr->insertEntry(idleTimeout_, entry);
         }
     }
 }

trantor/net/inner/TcpConnectionImpl.h

@@ -179,7 +179,7 @@ class TcpConnectionImpl : public TcpConnection,
     /// Internal use only.
 
     std::weak_ptr<KickoffEntry> kickoffEntry_;
-    std::shared_ptr<TimingWheel> timingWheelPtr_;
+    std::weak_ptr<TimingWheel> timingWheelWeakPtr_;
     size_t idleTimeout_{0};
     Date lastTimingWheelUpdateTime_;
 
@@ -191,9 +191,9 @@ class TcpConnectionImpl : public TcpConnection,
         assert(timeout > 0);
         auto entry = std::make_shared<KickoffEntry>(shared_from_this());
         kickoffEntry_ = entry;
-        timingWheelPtr_ = timingWheel;
+        timingWheelWeakPtr_ = timingWheel;
         idleTimeout_ = timeout;
-        timingWheelPtr_->insertEntry(timeout, entry);
+        timingWheel->insertEntry(timeout, entry);
     }
     void extendLife();
 #ifndef _WIN32