🎊add epoll for Mayhem server

🐛ASan error

CMakeLists.txt

@@ -10,6 +10,10 @@ project(${PROJECT_NAME}
     DESCRIPTION "A mini HTTP server library with C++"
     LANGUAGES CXX)
 
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 # dependencies
 add_subdirectory(libs)
 
@@ -25,6 +29,10 @@ endif()
 # strict warnings
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
 
+# optimization flags
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
+
 # library properties
 set(LIBRARY_BASE_PATH "${PROJECT_SOURCE_DIR}")
 set(PUBLIC_INCLUDE_DIRECTORIES "${LIBRARY_BASE_PATH}/include")

README.md

@@ -163,12 +163,13 @@ The server settings include the `name` of the server, and the `port` to listen o
 }
 ```
 
-Notably, `name` specifies which server to use. Currently, **minet-core** has two server implementation.
+Notably, `name` specifies which server to use. Currently, **minet-core** has three server implementation.
 
 - `Basic`: Default option, a blocking server that handles requests synchronously.
-- `Mayhem`: An experimental server that handles requests asynchronously.
+- `Threaded`: A server that handles requests in multiple threads with a thread pool.
+- `Mayhem`: An experimental server that handles requests using both epoll and thread pool.
 
-If you choose to use `Basic` server, then `threads` and `capacity` are ignored. For `Mayhem` server, `threads` is the number of worker threads, and `capacity` is the maximum requests queued on each worker thread.
+If you choose to use `Basic` server, then `threads` and `capacity` are ignored. For `Threaded` and `Mayhem` server, `threads` is the number of worker threads, and `capacity` is the maximum requests queued on each worker thread.
 
 ### Logging
 

demo/appsettings.mayhem.json

@@ -0,0 +1,35 @@
+{
+    "server": {
+        "name": "Mayhem",
+        "threads": 4,
+        "capacity": 1024,
+        "port": 5001
+    },
+    "logging": {
+        "level": "Debug",
+        "pattern": "[%Y-%m-%d %H:%M:%S] %^%=8l%$ [%n]: %v",
+        "sinks": [
+            {
+                "file": "stdout"
+            },
+            {
+                "pattern": "[%Y-%m-%d %H:%M:%S] %l [%n]: %v",
+                "file": "server.log"
+            }
+        ],
+        "loggers": {
+            "Demo": {
+                "level": "Debug",
+                "sinks": [
+                    {
+                        "file": "stdout"
+                    },
+                    {
+                        "pattern": "[%Y-%m-%d %H:%M:%S] %l: %v",
+                        "file": "app.log"
+                    }
+                ]
+            }
+        }
+    }
+}

demo/appsettings.mayhem.jsonc → demo/appsettings.threaded.json

@@ -9,26 +9,26 @@
     },
     "logging": {
         "level": "Debug",
-        "pattern": "",
+        "pattern": "[%Y-%m-%d %H:%M:%S] %^%=8l%$ [%n]: %v",
         "sinks": [
             {
                 "file": "stdout"
             },
             {
-                "pattern": "[%Y-%m-%d %H:%M:%S] %8l [%6n]: %v",
+                "pattern": "[%Y-%m-%d %H:%M:%S] %l [%n]: %v",
                 "file": "server.log"
             }
         ],
         "loggers": {
             "Demo": {
                 "level": "Debug",
-                "pattern": "[%Y-%m-%d %H:%M:%S] %^%l%$ [%6n]: %v",
                 "sinks": [
                     {
                         "file": "stdout"
                     },
                     {
-                        "file": "demo.log"
+                        "pattern": "[%Y-%m-%d %H:%M:%S] %l: %v",
+                        "file": "app.log"
                     }
                 ]
             }

include/minet/core/HttpContext.h

@@ -126,6 +126,15 @@ struct HttpContext
  */
 int CreateHttpContext(const network::AcceptData& data, Ref<HttpContext>* context);
 
+/**
+ * @brief Create HTTP context from file descriptor alone.
+ * @param fd The socket file descriptor.
+ * @param context Output new HTTP context.
+ * @return 0 on success, otherwise, see @link ParseHttpRequest.
+ * @warning In this case, the Host field in request will be "unknown".
+ */
+int CreateHttpContext(int fd, Ref<HttpContext>* context);
+
 /**
  * @brief Destroy a HTTP context after handling.
  * @param context The context to destroy.

scripts/demo.sh

@@ -20,7 +20,11 @@ function run_server() {
 
     ARGS="demo/appsettings.jsonc"
     if [ "$1" == "mayhem" ]; then
-        ARGS="demo/appsettings.mayhem.jsonc"
+        echo -e "\033[0;36mRun with Mayhem server...\033[0m"
+        ARGS="demo/appsettings.mayhem.json"
+    elif [ "$1" == "threaded" ]; then
+        echo -e "\033[0;36mRun with Threaded server...\033[0m"
+        ARGS="demo/appsettings.threaded.json"
     fi
 
     echo -e "\033[0;36m$BIN $ARGS\033[0m"
@@ -85,7 +89,8 @@ elif [ "$option" == "client" ]; then
     run_client $@
 else
     echo "Usage: $0 [server|client] [args]"
-    echo "  server        - run with Basic server"
-    echo "  server mayhem - run with Mayhem server"
-    echo "  client N      - 4 processes, each sends N requests"
+    echo "  server          - run with Basic server"
+    echo "  server threaded - run with Threaded server"
+    echo "  server mayhem   - run with Mayhem server"
+    echo "  client N        - 4 processes, each sends N requests"
 fi

src/components/BasicServer.cpp

@@ -59,22 +59,6 @@ void BasicServer::Stop()
     _isRunning = false;
 }
 
-void BasicServer::_OnNewConnection(const network::AcceptData& data)
-{
-    Ref<HttpContext> context;
-    int r = CreateHttpContext(data, &context);
-    if (r == 0)
-    {
-        _DecorateContext(context);
-        _logger->Debug("New connection from {}", context->Request.Host);
-        _onConnectionCallback(context);
-    }
-    else
-    {
-        _logger->Error("Failed to create HTTP context, error code: {}", r);
-    }
-}
-
 void BasicServer::_Serve()
 {
     network::AcceptData data;
@@ -83,7 +67,17 @@ void BasicServer::_Serve()
     {
         while (AcceptSocket(_listenFd, &data) && _isRunning)
         {
-            _OnNewConnection(data);
+            int r = CreateHttpContext(data, &context);
+            if (r == 0)
+            {
+                _DecorateContext(context);
+                _logger->Debug("New connection from {}", context->Request.Host);
+                _onConnectionCallback(context);
+            }
+            else
+            {
+                _logger->Error("Failed to create HTTP context, error code: {}", r);
+            }
         }
     }
 
@@ -93,7 +87,7 @@ void BasicServer::_Serve()
     _logger->Info("{} server shut down", Name());
 }
 
-void BasicServer::_DecorateContext(const Ref<HttpContext>& context)
+void BasicServer::_DecorateContext(const Ref<HttpContext>& context) const
 {
     context->Response.Headers["Server"] = Name();
 }

src/components/BasicServer.h

@@ -9,7 +9,7 @@ MINET_BEGIN
 /**
  * @brief The default server implementation.
  */
-class BasicServer : public IServer
+class BasicServer final : public IServer
 {
 public:
     explicit BasicServer(const Ref<ServerConfig>& config);
@@ -29,29 +29,22 @@ class BasicServer : public IServer
 
     void Stop() override;
 
-    void SetOnConnection(const OnConnectionCallback& callback) override
-    {
-        _onConnectionCallback = callback;
-    }
-
     const char* Name() const override
     {
         return Identifier();
     }
 
-protected:
-    virtual void _OnNewConnection(const network::AcceptData& data);
-    void _DecorateContext(const Ref<HttpContext>& context);
-
 private:
     void _Serve();
 
+    void _DecorateContext(const Ref<HttpContext>& context) const;
+
     void _OpenSocket();
     void _CloseSocket();
 
 protected:
     Ref<ServerConfig> _config;
-    OnConnectionCallback _onConnectionCallback;
+
     int _listenFd;
     bool _isRunning;
 };