[feat]增加引用spdlog

.vscode/settings.json

@@ -70,6 +70,7 @@
         "vector": "cpp",
         "algorithm": "cpp",
         "shared_mutex": "cpp",
-        "__memory": "cpp"
+        "__memory": "cpp",
+        "thread": "cpp"
     }
 }

.vscode/tasks.json

@@ -15,7 +15,9 @@
                 "hv_utils.cpp",
                 "tcp_inbound.cpp",
                 "main.cpp",
-                "-lhv"
+                "-lhv",
+                "-lspdlog"
+                
             ],
             "group": {
                 "kind": "build",

Dockerfile

@@ -10,6 +10,10 @@ RUN apt-get update
 # Install build tools
 RUN apt-get install -y g++ make cmake autoconf automake libtool
 
+# 安装 spdlog 依赖
+RUN apt-get install -y \
+    libfmt-dev
+
 # Download and build libhv from source
 RUN apt-get install -y git
 RUN git clone https://github.com/ithewei/libhv.git /usr/src/libhv
@@ -20,6 +24,28 @@ RUN make install
 # Add the libhv library path
 RUN ldconfig
 
+# 克隆 spdlog 仓库
+RUN git clone https://github.com/gabime/spdlog.git /usr/src/spdlog
+
+WORKDIR /usr/src/spdlog
+
+# 创建 build 目录并进入
+RUN mkdir build && cd build
+
+# 运行 CMake 配置
+RUN cmake ..
+
+# 运行构建
+RUN make
+
+# （可选）运行测试
+RUN make test
+
+# 运行安装
+RUN make install
+
+RUN ldconfig
+
 # Set the working directory to /app
 WORKDIR /app
 
@@ -27,7 +53,13 @@ WORKDIR /app
 COPY . .
 
 # Compile the C++ program
-RUN g++ -std=c++14 -g -o proxyServer hv_utils.cpp tcp_inbound.cpp main.cpp -I include -I include/bolt -lhv
+RUN g++ -std=c++14 -g -o proxyServer hv_utils.cpp tcp_inbound.cpp main.cpp -I include -I include/bolt -lhv - lspdlog
+
+RUN apt-get update && \
+    apt-get install -y tzdata
+
+# 设置时区为 Asia/Shanghai
+ENV TZ=Asia/Shanghai
 
 EXPOSE 8080
 # Run my_program when the container launches

main.cpp

@@ -132,6 +132,10 @@
 #include "include/hv_utils.h"
 #include "include/tcp_inbound.h"
 
+#include "spdlog/spdlog.h"
+#include "spdlog/async.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
+
 static const char* host = "0.0.0.0";
 static int port = 8080;
 static int thread_num = 4;
@@ -179,9 +183,25 @@ int main(int argc, char** argv) {
     //     return -10;
     // }
     // port = atoi(argv[1]);
+    int cores = std::thread::hardware_concurrency();
+    if (cores > 0) {
+        thread_num = cores;
+    }
+    
+    auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    auto logger = std::make_shared<spdlog::logger>("my_logger", console_sink);
+
+    // 设置异步模式，设置线程数（0 表示使用 CPU 核心数）
+    spdlog::init_thread_pool(8192, thread_num);
+
+    // 设置异步日志器
+    spdlog::set_default_logger(std::make_shared<spdlog::async_logger>(
+        "ProxyServer", console_sink, spdlog::thread_pool(), spdlog::async_overflow_policy::block));
 
     init_loop(thread_num, worker_thread);
 
+    spdlog::info("ProxyServer start: threadNum:%d", thread_num);
+
     accept_loop = hloop_new(HLOOP_FLAG_AUTO_FREE);
     accept_thread(accept_loop);
 

tcp_inbound.cpp

@@ -4,6 +4,7 @@
 #include "hv/hsocket.h"
 #include "hv/hthread.h"
 #include "hv/TcpClient.h"
+#include "spdlog/spdlog.h"
 #include <string>
 
 class TcpClientShell {
@@ -17,20 +18,20 @@ class TcpClientShell {
             cli.onConnection = [this](const hv::SocketChannelPtr& channel) {
                 std::string peeraddr = channel->peeraddr();
                 if (channel->isConnected()) {
-                    printf("connected to %s! connfd=%d\n", peeraddr.c_str(), channel->fd());
+                    spdlog::info("connected to %s! connfd=%d\n", peeraddr.c_str(), channel->fd());
                     if (wait_send_buf.getDataSize() > 0)
                     {
                         cli.send(wait_send_buf.getData(), wait_send_buf.getDataSize());
                     }
                 } else {
-                    printf("disconnected to %s! connfd=%d\n", peeraddr.c_str(), channel->fd());
+                    spdlog::info("disconnected to %s! connfd=%d\n", peeraddr.c_str(), channel->fd());
                     hio_close(io);
                 }
             };
 
             cli.onMessage = [this](const hv::SocketChannelPtr& channel, hv::Buffer* buf) {
                 hio_write(io, buf->data(), buf->size());
-                printf("< %.*s\n", (int)buf->size(), (char*)buf->data());
+                spdlog::info("< %.*s\n", (int)buf->size(), (char*)buf->data());
             };
 
             cli.onWriteComplete = [this](const hv::SocketChannelPtr& channel, hv::Buffer* buf) {
@@ -60,12 +61,12 @@ class TcpClientShell {
 };
 
 static void tcp_on_close(hio_t* io) {
-    printf("on_close fd=%d error=%d\n", hio_fd(io), hio_error(io));
+    spdlog::info("tcp_on_close fd=%d error=%d\n", hio_fd(io), hio_error(io));
     ConnMap<hio_t*, TcpClientShell>::getInstance().remove(io);
 }
 
 static void tcp_on_recv(hio_t* io, void* buf, int readbytes) {
-    // echo
+    spdlog::info("tcp_on_recv fd=%d buf(%d)=%s\n", hio_fd(io), readbytes, buf);
     hio_write(io, buf, readbytes);
     auto cli = ConnMap<hio_t*, TcpClientShell>::getInstance().get(io);
     if(cli) {
@@ -78,7 +79,7 @@ void tcp_on_accept(hio_t* io, hevent_t* ev) {
 
     char localaddrstr[SOCKADDR_STRLEN] = {0};
     char peeraddrstr[SOCKADDR_STRLEN] = {0};
-    printf("tid=%ld connfd=%d [%s] <= [%s]\n",
+    spdlog::info("tcp_on_accept tid=%ld connfd=%d [%s] <= [%s]\n",
             (long)hv_gettid(),
             (int)hio_fd(io),
             SOCKADDR_STR(hio_localaddr(io), localaddrstr),