fix(terminal):修复终端交互中执行quit断开会话引起的Session没有释放导致内存增长问题

Author: baldwin-law

examples/terminal/tcp_rpc/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     auto sp_loop = Loop::New();
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
-    Terminal term;
+    Terminal term(sp_loop);
     term.setWelcomeText("Welcome to Terminal TcpRPC demo! \r\n");
     TcpRpc rpc(sp_loop, &term);
     if (!rpc.initialize(bind_addr)) {

examples/terminal/telnetd/main.cpp

@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     auto sp_loop = Loop::New();
     SetScopeExitAction([sp_loop] { delete sp_loop; });
 
-    Terminal term;
+    Terminal term(sp_loop);
     term.setWelcomeText("Welcome to Terminal Telnet demo! \r\n");
     Telnetd telnetd(sp_loop, &term);
     if (!telnetd.initialize(bind_addr)) {

modules/main/context_imp.cpp

@@ -77,7 +77,7 @@ ContextImp::ContextImp() :
     sp_thread_pool_(new eventx::ThreadPool(sp_loop_)),
     sp_timer_pool_(new eventx::TimerPool(sp_loop_)),
     sp_async_(new eventx::Async(sp_thread_pool_)),
-    sp_terminal_(new terminal::Terminal),
+    sp_terminal_(new terminal::Terminal(sp_loop_)),
     sp_telnetd_(new terminal::Telnetd(sp_loop_, sp_terminal_)),
     sp_tcp_rpc_(new terminal::TcpRpc(sp_loop_, sp_terminal_)),
     sp_coroutine_(new coroutine::Scheduler(sp_loop_)),

modules/terminal/impl/terminal.cpp

@@ -24,7 +24,6 @@
 #include <tbox/base/log.h>
 
 #include "../connection.h"
-#include "session_context.h"
 #include "dir_node.h"
 #include "func_node.h"
 
@@ -33,7 +32,8 @@ namespace terminal {
 
 using namespace std;
 
-Terminal::Impl::Impl()
+Terminal::Impl::Impl(event::Loop *wp_loop)
+    : wp_loop_(wp_loop)
 {
     welcome_text_ = \
         "\r\n"
@@ -71,7 +71,7 @@ Terminal::Impl::~Impl()
 
 SessionToken Terminal::Impl::newSession(Connection *wp_conn)
 {
-    auto s = new SessionContext;
+    auto s = session_ctx_pool_.alloc();
     auto t = sessions_.alloc(s);
     s->wp_conn = wp_conn;
     s->token = t;
@@ -82,7 +82,7 @@ bool Terminal::Impl::deleteSession(const SessionToken &st)
 {
     auto s = sessions_.free(st);
     if (s != nullptr) {
-        delete s;
+        session_ctx_pool_.free(s);
         return true;
     }
     return false;

modules/terminal/impl/terminal.h

@@ -21,18 +21,19 @@
 #define TBOX_TELNETD_TERMINAL_IMPL_H_20220128
 
 #include <tbox/base/cabinet.hpp>
+#include <tbox/base/object_pool.hpp>
+#include <tbox/event/forward.h>
 
 #include "../terminal.h"
 #include "node.h"
+#include "session_context.h"
 
 namespace tbox {
 namespace terminal {
 
-struct SessionContext;
-
 class Terminal::Impl {
   public:
-    Impl();
+    Impl(event::Loop *wp_loop);
     ~Impl();
 
   public:
@@ -92,6 +93,9 @@ class Terminal::Impl {
     bool findNode(const std::string &path, Path &node_path) const;
 
   private:
+    event::Loop *wp_loop_ = nullptr;
+
+    ObjectPool<SessionContext> session_ctx_pool_{1};
     cabinet::Cabinet<SessionContext> sessions_;
     cabinet::Cabinet<Node> nodes_;
     NodeToken root_token_;

modules/terminal/impl/terminal_commands.cpp

@@ -25,6 +25,7 @@
 #include <tbox/base/log.h>
 #include <tbox/util/split_cmdline.h>
 #include <tbox/util/string.h>
+#include <tbox/event/loop.h>
 
 #include "session_context.h"
 #include "dir_node.h"
@@ -180,23 +181,28 @@ void Terminal::Impl::executeLsCmd(SessionContext *s, const Args &args)
     s->wp_conn->send(s->token, ss.str());
 }
 
-void Terminal::Impl::executeHistoryCmd(SessionContext *s, const Args &args)
+void Terminal::Impl::executeHistoryCmd(SessionContext *s, const Args &)
 {
     stringstream ss;
     for (size_t i = 0; i < s->history.size(); ++i) {
         const auto &cmd = s->history.at(i);
         ss << setw(2) << i << "  " << cmd << "\r\n";
     }
     s->wp_conn->send(s->token, ss.str());
-    (void)args;
 }
 
-void Terminal::Impl::executeExitCmd(SessionContext *s, const Args &args)
+void Terminal::Impl::executeExitCmd(SessionContext *s, const Args &)
 {
     if (!(s->options & kQuietMode))
         s->wp_conn->send(s->token, "Bye!\r\n");
-    s->wp_conn->endSession(s->token);
-    (void)args;
+
+    wp_loop_->runNext(
+        [this, s] {
+            s->wp_conn->endSession(s->token);
+            deleteSession(s->token);
+        },
+        __func__
+    );
 }
 
 void Terminal::Impl::executeTreeCmd(SessionContext *s, const Args &args)
@@ -309,7 +315,7 @@ void Terminal::Impl::executeTreeCmd(SessionContext *s, const Args &args)
     s->wp_conn->send(s->token, ss.str());
 }
 
-void Terminal::Impl::executePwdCmd(SessionContext *s, const Args &args)
+void Terminal::Impl::executePwdCmd(SessionContext *s, const Args &)
 {
     stringstream ss;
     ss << '/';
@@ -320,7 +326,6 @@ void Terminal::Impl::executePwdCmd(SessionContext *s, const Args &args)
     }
     ss << "\r\n";
     s->wp_conn->send(s->token, ss.str());
-    (void)args;
 }
 
 bool Terminal::Impl::executeRunHistoryCmd(SessionContext *s, const Args &args)

modules/terminal/terminal.cpp

@@ -25,8 +25,8 @@
 namespace tbox {
 namespace terminal {
 
-Terminal::Terminal() :
-    impl_(new Impl)
+Terminal::Terminal(event::Loop *wp_loop) :
+    impl_(new Impl(wp_loop))
 {
     TBOX_ASSERT(impl_ != nullptr);
 }

modules/terminal/terminal.h

@@ -23,13 +23,15 @@
 #include "terminal_interact.h"
 #include "terminal_nodes.h"
 
+#include <tbox/event/forward.h>
+
 namespace tbox {
 namespace terminal {
 
 class Terminal : public TerminalInteract,
                  public TerminalNodes {
   public:
-    Terminal();
+    Terminal(event::Loop *wp_loop);
     virtual ~Terminal() override;
 
   public: