Merge pull request #4 from Shfdis/big-refactor

Big refactor

Author: Shfdis

.clangd

@@ -0,0 +1,6 @@
+CompileFlags:
+  Remove:
+    - -fmodules
+    - -fcxx-modules
+    - -fmodule-map-file=*
+    - -fmodule-file=*

.gitignore

@@ -18,9 +18,11 @@ compile_commands.json
 echo_server
 
 # IDE/Editor
-.cache/
-.vscode/
-.idea/
+*.cache/
+*.vscode/
+*.idea/
+*.agents/
+*.codex/
 *.swp
 *.swo
 *~

README.md

@@ -42,10 +42,7 @@ int main() {
   });
 
   auto server = builder.Build();
-  server.Start();
-  
-  // Keep running
-  std::promise<void>().get_future().wait();
+  server.Start().Get();
 }
 ```
 ## Benchmarks

example/CMakeLists.txt

@@ -1,16 +1,26 @@
 cmake_minimum_required(VERSION 3.12)
-project(example_echo_server CXX)
+
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-get_filename_component(SERVER_DIR "${CMAKE_CURRENT_LIST_DIR}/../server" ABSOLUTE)
-execute_process(COMMAND ${CMAKE_COMMAND} -S "${SERVER_DIR}" -B build_dep -DCMAKE_INSTALL_PREFIX=install_dep -DCMAKE_CXX_STANDARD=20)
-execute_process(COMMAND ${CMAKE_COMMAND} --build build_dep --target install)
-
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/install_dep)
-find_package(coro_http_server REQUIRED)
+project(example_echo_server CXX)
+set(BIN_OUTPUT_DIR ${CMAKE_CURRENT_LIST_DIR}/../bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
+  string(TOUPPER ${cfg} cfg_upper)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+endforeach()
 
 option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../server coro_server_build)
+set(CORO_SERVER_DIR ${CMAKE_CURRENT_LIST_DIR}/../server)
+add_subdirectory(${CORO_SERVER_DIR} coro_server_build)
 add_executable(echo_server main.cpp)
+target_compile_options(echo_server PRIVATE -O3 -g -fno-omit-frame-pointer)
+if (ENABLE_ASAN)
+  target_compile_options(echo_server PRIVATE -fsanitize=address)
+  target_link_options(echo_server PRIVATE -fsanitize=address)
+endif()
 target_link_libraries(echo_server PRIVATE coro_http_server::coro_http_server)

example/main.cpp

@@ -1,6 +1,6 @@
 #include "request_data.h"
 #include "server.h"
-#include <future>
+#include <string_view>
 int main() {
   HTTP::ServerBuilder builder;
   builder.SetPort(8080);
@@ -29,8 +29,6 @@ int main() {
                        return response;
                      });
   auto server = builder.Build();
-  server.Start();
-  std::promise<void> keep_alive;
-  keep_alive.get_future().wait();
+  server.Start().Get();
   return 0;
 }

server/CMakeLists.txt

@@ -1,22 +1,44 @@
 cmake_minimum_required(VERSION 3.12)
-project(coro_http_server CXX)
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+project(coro_http_server CXX)
+set(BIN_OUTPUT_DIR ${CMAKE_CURRENT_LIST_DIR}/../bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIR})
+foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
+  string(TOUPPER ${cfg} cfg_upper)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${cfg_upper} ${BIN_OUTPUT_DIR})
+endforeach()
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(LIBURING REQUIRED liburing)
 
-file(GLOB SRCS *.cpp)
-file(GLOB HDRS *.h)
-
-add_library(coro_http_server ${SRCS})
-target_include_directories(coro_http_server PUBLIC 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
+add_library(coro_http_server
+  src/io_uring.cpp
+  src/read_iterator.cpp
+  src/http_error.cpp
+  src/trie.cpp
+  src/server.cpp
+)
+add_library(coro_http_server::coro_http_server ALIAS coro_http_server)
+target_compile_options(coro_http_server PUBLIC -fmodules)
+target_include_directories(coro_http_server PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>
     ${LIBURING_INCLUDE_DIRS}
 )
+target_compile_options(coro_http_server PRIVATE -O3 -g -fno-omit-frame-pointer)
+if (ENABLE_ASAN)
+  target_compile_options(coro_http_server PRIVATE -fsanitize=address)
+  target_link_options(coro_http_server PUBLIC -fsanitize=address)
+endif()
 target_link_libraries(coro_http_server PUBLIC ${LIBURING_LIBRARIES})
 
 include(GNUInstallDirs)
 install(TARGETS coro_http_server EXPORT MyServerConfig DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(EXPORT MyServerConfig FILE coro_http_serverConfig.cmake NAMESPACE coro_http_server:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/coro_http_server)
-install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})