[Src && Example && CI/CD] Make it adapt to UNIX, fix some bugs and implement RPC module

.github/pull_request_template.md

@@ -1,16 +1,18 @@
 <!-- taotu PR Template -->
 
-### Purpose
-<!-- Links to Design Docs, Github Issues or a few words about the purpose of this PR -->
+#
+
+## Purpose
+<!-- Links to Design Docs, GitHub Issues or a few words about the purpose of this PR -->
 
 - Purpose.
 
-### Changes
+## Changes
 <!-- Major changes in this PR: -->
 
 - No changes.
 
-### Review Instructions
+## Review Instructions
 <!-- Please provide instructions about how should a reviewer test/verify the changes in this PR: -->
 
 - No instructions.

.github/workflows/c-cpp.yml

@@ -17,17 +17,42 @@ jobs:
     - uses: actions/checkout@v2
     - name: init
       run: mkdir build
+    - name: Install protobuf manually
+      run: |
+        sudo apt-get install libtool pkg-config wget git ninja-build
+        git clone --recursive https://github.com/protocolbuffers/protobuf.git
+        cd protobuf
+        git checkout tags/v24.2
+        mkdir build
+        cd build
+        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -G Ninja ..
+        ninja
+        sudo ninja install
+        sudo ldconfig
     - name: Install gtest manually
-      run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
+      run: |
+        sudo apt-get install libgtest-dev
+        cd /usr/src/gtest
+        sudo cmake -DCMAKE_BUILD_TYPE=Release -G Ninja CMakeLists.txt
+        sudo ninja
+        sudo cp lib/*.a /usr/lib
+        sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a
+        sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
     - name: Install llhttp manually
       working-directory: ${{github.workspace}}/..
-      run: git clone https://github.com/nodejs/llhttp.git && cd llhttp && sudo apt-get install npm && npm install && make && sudo make install
+      run: |
+        git clone https://github.com/nodejs/llhttp.git
+        cd llhttp
+        sudo apt-get install npm
+        npm install
+        make
+        sudo make install
     - name: cmake
       working-directory: build
-      run: cmake ..
-    - name: make
+      run: cmake -DProtobuf_DIR=`pkg-config --variable=prefix protobuf` -DCMAKE_BUILD_TYPE=Release -G Ninja  ..
+    - name: ninja
       working-directory: build
-      run: make
+      run: ninja
     - name: gtest
       working-directory: ${{github.workspace}}/build/output/bin
       # Execute tests defined by the CMake configuration.  

.github/workflows/cmake.yml

@@ -14,25 +14,51 @@ env:
 
 jobs:
   build:
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
+    # The CMake configure and build commands are platform-agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install protobuf manually
+      run: |
+        sudo apt-get install libtool pkg-config wget git ninja-build
+        git clone --recursive https://github.com/protocolbuffers/protobuf.git
+        cd protobuf
+        git checkout tags/v24.2
+        mkdir build
+        cd build
+        cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -G Ninja ..
+        ninja
+        sudo ninja install
+        sudo ldconfig
+
     - name: Install gtest manually
-      run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp lib/*.a /usr/lib && sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a && sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
+      run: |
+        sudo apt-get install libgtest-dev
+        cd /usr/src/gtest
+        sudo cmake -DCMAKE_BUILD_TYPE=Release -G Ninja CMakeLists.txt
+        sudo ninja
+        sudo cp lib/*.a /usr/lib
+        sudo ln -s /usr/lib/libgtest.a /usr/local/lib/libgtest.a
+        sudo ln -s /usr/lib/libgtest_main.a /usr/local/lib/libgtest_main.a
 
     - name: Install llhttp manually
       working-directory: ${{github.workspace}}/..
-      run: git clone https://github.com/nodejs/llhttp.git && cd llhttp && sudo apt-get install npm && npm install && make && sudo make install
+      run: |
+        git clone https://github.com/nodejs/llhttp.git
+        cd llhttp
+        sudo apt-get install npm
+        npm install
+        make
+        sudo make install
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G Ninja 
 
     - name: Build
       # Build your program with the given configuration

.gitignore

@@ -1,7 +1,9 @@
 .cache/*
 .vscode/*
-build/*
+build*/*
 .idea/*
+src/rpc.pb*
+example/rpc_demo/time_service/time_service.pb*
 cmake-build-debug/*
 cmake-build-release/*
 CMakeLists.txt.user

CMakeLists.txt

@@ -7,9 +7,13 @@ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++17")
 
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++17 -fsanitize=address -Wall -O0 -DTAOTU_DEBUG")
 
-ADD_DEFINITIONS(-Wno-format-security)
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  message(STATUS "Darwin detected, not using -fsanitize=leak")
+else()
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=leak")
+endif()
 
-STRING(REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}")
+ADD_DEFINITIONS(-Wno-format-security)
 
 IF(CMAKE_BUILD_TYPE AND (CMAKE_BUILD_TYPE STREQUAL "Debug"))
   MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG = " ${CMAKE_CXX_FLAGS_DEBUG})

example/CMakeLists.txt

@@ -4,3 +4,4 @@ ADD_SUBDIRECTORY(simple_time)
 ADD_SUBDIRECTORY(chat_room)
 ADD_SUBDIRECTORY(pingpong)
 ADD_SUBDIRECTORY(http_server)
+ADD_SUBDIRECTORY(rpc_demo)

example/chat_room/chat_server.cc

@@ -13,12 +13,10 @@
 #include <stdio.h>
 
 ChatServer::ChatServer(const taotu::NetAddress& listen_address,
-                       bool should_reuse_port, size_t io_thread_amount,
-                       size_t calculation_thread_amount)
-    : event_manager_(new taotu::EventManager),
-      server_(std::make_unique<taotu::Server>(
-          event_manager_, listen_address, should_reuse_port, io_thread_amount,
-          calculation_thread_amount)),
+                       bool should_reuse_port, size_t io_thread_amount)
+    : event_managers_(io_thread_amount, new taotu::EventManager),
+      server_(std::make_unique<taotu::Server>(&event_managers_, listen_address,
+                                              should_reuse_port)),
       codec_([this](taotu::Connecting& connection, const std::string& message,
                     taotu::TimePoint time_point) {
         this->OnCodecMessage(connection, message, time_point);
@@ -33,14 +31,14 @@ ChatServer::ChatServer(const taotu::NetAddress& listen_address,
   });
 }
 ChatServer::~ChatServer() {
-  delete event_manager_;
+  size_t event_managers_size = event_managers_.size();
+  for (size_t i = 0; i < event_managers_size; ++i) {
+    delete event_managers_[i];
+  }
   taotu::END_LOG();
 }
 
-void ChatServer::Start() {
-  server_->Start();
-  event_manager_->Work();
-}
+void ChatServer::Start() { server_->Start(); }
 
 void ChatServer::OnConnectionCallback(taotu::Connecting& connection) {
   taotu::LOG_DEBUG(

example/chat_room/chat_server.h

@@ -20,8 +20,10 @@
 
 class ChatServer : taotu::NonCopyableMovable {
  public:
+  typedef std::vector<taotu::EventManager*> EventManagers;
+
   ChatServer(const taotu::NetAddress& listen_address, bool should_reuse_port,
-             size_t io_thread_amount = 3, size_t calculation_thread_amount = 0);
+             size_t io_thread_amount = 3);
   ~ChatServer();
 
   // Start the server
@@ -37,7 +39,7 @@ class ChatServer : taotu::NonCopyableMovable {
   void OnCodecMessage(taotu::Connecting& connection, const std::string& message,
                       taotu::TimePoint);
 
-  taotu::EventManager* event_manager_;
+  EventManagers event_managers_;
   std::unique_ptr<taotu::Server> server_;
   Codec codec_;
   ConnectionSet connections_;

example/chat_room/server_main.cc

@@ -13,8 +13,7 @@
 #include "chat_server.h"
 
 // Call it by:
-// './chat_server [port [amount-of-I/O-threads
-// [amount-of-calculation-threads]]]'
+// './chat_server [port [amount-of-I/O-threads]]'
 int main(int argc, char* argv[]) {
   taotu::START_LOG("server_main_log.txt");
   if (1 == argc) {
@@ -25,18 +24,11 @@ int main(int argc, char* argv[]) {
                                std::stoi(std::string{argv[1]}))},
                            false};
     chat_server.Start();
-  } else if (3 == argc) {
-    ChatServer chat_server{
-        taotu::NetAddress{
-            static_cast<uint16_t>(std::stoi(std::string{argv[1]}))},
-        false, static_cast<size_t>(std::stoi(std::string{argv[2]}))};
-    chat_server.Start();
   } else {
     ChatServer chat_server{
         taotu::NetAddress{
             static_cast<uint16_t>(std::stoi(std::string{argv[1]}))},
-        false, static_cast<size_t>(std::stoi(std::string{argv[2]})),
-        static_cast<size_t>(std::stoi(std::string{argv[3]}))};
+        false, static_cast<size_t>(std::stoi(std::string{argv[2]}))};
     chat_server.Start();
   }
   return 0;

example/http_server/http_server.cc

@@ -10,16 +10,16 @@
 
 #include "http_server.h"
 
+#include <stddef.h>
+
 #include "http_parser.h"
 #include "http_response.h"
 
 HttpServer::HttpServer(const taotu::NetAddress& listen_address,
-                       bool should_reuse_port, size_t io_thread_amount,
-                       size_t calculation_thread_amount)
-    : event_manager_(new taotu::EventManager),
-      server_(std::make_unique<taotu::Server>(
-          event_manager_, listen_address, should_reuse_port, io_thread_amount,
-          calculation_thread_amount)) {
+                       bool should_reuse_port, size_t io_thread_amount)
+    : event_managers_(io_thread_amount, new taotu::EventManager),
+      server_(std::make_unique<taotu::Server>(&event_managers_, listen_address,
+                                              should_reuse_port)) {
   server_->SetConnectionCallback([this](taotu::Connecting& connection) {
     this->OnConnectionCallback(connection);
   });
@@ -31,14 +31,14 @@ HttpServer::HttpServer(const taotu::NetAddress& listen_address,
 }
 
 HttpServer::~HttpServer() {
-  delete event_manager_;
+  size_t event_managers_size = event_managers_.size();
+  for (size_t i = 0; i < event_managers_size; ++i) {
+    delete event_managers_[i];
+  }
   taotu::END_LOG();
 }
 
-void HttpServer::Start() {
-  server_->Start();
-  event_manager_->Work();
-}
+void HttpServer::Start() { server_->Start(); }
 
 void HttpServer::OnConnectionCallback(taotu::Connecting& connection) {
   if (connection.IsConnected()) {

example/http_server/http_server.h

@@ -20,8 +20,10 @@
 
 class HttpServer : taotu::NonCopyableMovable {
  public:
+  typedef std::vector<taotu::EventManager*> EventManagers;
+
   HttpServer(const taotu::NetAddress& listen_address, bool should_reuse_port,
-             size_t io_thread_amount = 4, size_t calculation_thread_amount = 0);
+             size_t io_thread_amount = 4);
   ~HttpServer();
 
   // Start the server
@@ -44,7 +46,7 @@ class HttpServer : taotu::NonCopyableMovable {
   // Called when a request arriving
   void OnRequest(taotu::Connecting& connection, const HttpParser& http_parser);
 
-  taotu::EventManager* event_manager_;
+  EventManagers event_managers_;
   std::unique_ptr<taotu::Server> server_;
 
   std::function<void(const HttpParser&, HttpResponse*)> HttpCallback_;

example/http_server/main.cc

@@ -39,8 +39,7 @@ void OnRequest(const HttpParser& http_parser, HttpResponse* http_response) {
 }
 
 // Call it by:
-// './http_server [port [amount-of-I/O-threads
-// [amount-of-calculation-threads]]]'
+// './http_server [port [amount-of-I/O-threads]]'
 int main(int argc, char* argv[]) {
   taotu::START_LOG("http_server_log.txt");
   if (1 == argc) {
@@ -59,22 +58,11 @@ int main(int argc, char* argv[]) {
           OnRequest(http_parser, http_response);
         });
     http_server.Start();
-  } else if (3 == argc) {
-    HttpServer http_server{
-        taotu::NetAddress{
-            static_cast<uint16_t>(std::stoi(std::string{argv[1]}))},
-        false, static_cast<size_t>(std::stoi(std::string{argv[2]}))};
-    http_server.SetHttpCallback(
-        [](const HttpParser& http_parser, HttpResponse* http_response) {
-          OnRequest(http_parser, http_response);
-        });
-    http_server.Start();
   } else {
     HttpServer http_server{
         taotu::NetAddress{
             static_cast<uint16_t>(std::stoi(std::string{argv[1]}))},
-        false, static_cast<size_t>(std::stoi(std::string{argv[2]})),
-        static_cast<size_t>(std::stoi(std::string{argv[3]}))};
+        false, static_cast<size_t>(std::stoi(std::string{argv[2]}))};
     http_server.SetHttpCallback(
         [](const HttpParser& http_parser, HttpResponse* http_response) {
           OnRequest(http_parser, http_response);

example/pingpong/pingpong_server.cc

@@ -11,12 +11,10 @@
 #include "pingpong_server.h"
 
 PingpongServer::PingpongServer(const taotu::NetAddress& listen_address,
-                               bool should_reuse_port, size_t io_thread_amount,
-                               size_t calculation_thread_amount)
-    : event_manager_(new taotu::EventManager),
-      server_(std::make_unique<taotu::Server>(
-          event_manager_, listen_address, should_reuse_port, io_thread_amount,
-          calculation_thread_amount)) {
+                               bool should_reuse_port, size_t io_thread_amount)
+    : event_managers_(io_thread_amount, new taotu::EventManager),
+      server_(std::make_unique<taotu::Server>(&event_managers_, listen_address,
+                                              should_reuse_port)) {
   server_->SetConnectionCallback([this](taotu::Connecting& connection) {
     this->OnConnectionCallback(connection);
   });
@@ -27,14 +25,14 @@ PingpongServer::PingpongServer(const taotu::NetAddress& listen_address,
   });
 }
 PingpongServer::~PingpongServer() {
-  delete event_manager_;
+  size_t event_managers_size = event_managers_.size();
+  for (size_t i = 0; i < event_managers_size; ++i) {
+    delete event_managers_[i];
+  }
   taotu::END_LOG();
 }
 
-void PingpongServer::Start() {
-  server_->Start();
-  event_manager_->Work();
-}
+void PingpongServer::Start() { server_->Start(); }
 
 void PingpongServer::OnConnectionCallback(taotu::Connecting& connection) {
   if (connection.IsConnected()) {