Change to use epoll

Author: freshthinking

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 set(BUILD_VERSION 0.1.0.0)
-project(slick_socket VERSION ${BUILD_VERSION} LANGUAGES CXX)
+project(slick_socket VERSION ${BUILD_VERSION} LANGUAGES C CXX)
 
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -47,17 +47,23 @@ if (MSVC)
   set(CMAKE_SUPPRESS_REGENERATION true)   # supress zero_check project
 endif()
 
-add_library(slick_socket INTERFACE)
-target_include_directories(slick_socket INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<INSTALL_INTERFACE:include>
-)
-
 if(WIN32)
-  target_compile_definitions(slick_socket INTERFACE _WIN32_WINNT=0x0601)
-  target_link_libraries(slick_socket INTERFACE ws2_32)
+  add_library(slick_socket STATIC src/wepoll.c)
+  set_target_properties(slick_socket PROPERTIES 
+    ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib
+  )
+  target_include_directories(slick_socket PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+  )
+  target_compile_definitions(slick_socket PUBLIC _WIN32_WINNT=0x0601)
+  target_link_libraries(slick_socket PUBLIC ws2_32)
 elseif(UNIX)
-  # Unix doesn't need additional libraries for basic socket operations
+  add_library(slick_socket INTERFACE)
+  target_include_directories(slick_socket INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+  )
 endif()
 
 option(BUILD_SLICK_SOCKET_EXAMPLES "Build tests" ON)
@@ -75,6 +81,9 @@ endif()
 
 # Installation rules
 install(DIRECTORY include/ DESTINATION include)
+if (WIN32)
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}/ DESTINATION lib)
+endif()
 
 # Automatically run install after build in Release mode
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
@@ -86,7 +95,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release")
 
   if (PROJECT_IS_TOP_LEVEL)
       add_custom_target(package_slick_socket ALL
-          COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${CMAKE_BINARY_DIR}/dist/slick_socket_${BUILD_VERSION}.zip" --format=zip "include"
+          COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${CMAKE_BINARY_DIR}/dist/slick_socket_${BUILD_VERSION}.zip" --format=zip "include" "lib"
           WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/dist"
           COMMENT "Creating zip archive"
       )

examples/CMakeLists.txt

@@ -7,6 +7,8 @@ target_include_directories(tcp_server_example
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR})
 
+target_link_libraries(tcp_server_example PRIVATE slick_socket)
+
 add_executable(tcp_client_example
     tcp_client_example.cpp
 )
@@ -16,6 +18,8 @@ target_include_directories(tcp_client_example
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR})
 
+target_link_libraries(tcp_client_example PRIVATE slick_socket)
+
 add_executable(multicast_sender_example
     multicast_sender_example.cpp
 )

include/slick_socket/tcp_client_win32.h

@@ -107,7 +107,6 @@ inline bool TCPClientBase<DerivedT, LoggerT>::connect()
     client_thread_ = std::thread(&TCPClientBase::client_loop, this);
 
     derived().onConnected();
-    logger_.logInfo("Successfully connected to server");
     return true;
 }
 

include/slick_socket/tcp_server.h

@@ -27,7 +27,7 @@ struct TCPServerConfig
     int cpu_affinity = -1;  // -1 means no affinity, otherwise specify CPU core index
 };
 
-template<typename DrivedT, typename LoggerT = ConsoleLogger>
+template<typename DerivedT, typename LoggerT = ConsoleLogger>
 class TCPServerBase
 {
 public:
@@ -52,8 +52,8 @@ class TCPServerBase
     }
 
 protected:
-    DrivedT& derived() { return static_cast<DrivedT&>(*this); }
-    const DrivedT& derived() const { return static_cast<const DrivedT&>(*this); }
+    DerivedT& derived() { return static_cast<DerivedT&>(*this); }
+    const DerivedT& derived() const { return static_cast<const DerivedT&>(*this); }
 
     void server_loop();
     void accept_new_client();
@@ -75,8 +75,6 @@ class TCPServerBase
         return clients_.size();
     }
 
-protected:
-
 #if defined(_WIN32) || defined(_WIN64)
     using SocketT = SOCKET;
     static constexpr SocketT invalid_socket = INVALID_SOCKET;
@@ -85,6 +83,10 @@ class TCPServerBase
     static constexpr SocketT invalid_socket = -1;
 #endif
 
+    void close_socket(SocketT socket);
+
+protected:
+
     struct ClientInfo
     {
         SocketT socket;
@@ -99,7 +101,14 @@ class TCPServerBase
     std::thread server_thread_;
     SocketT server_socket_ = invalid_socket;
 
+#if !defined(_WIN32) && !defined(_WIN64)
+    int epoll_fd_ = -1;  // epoll file descriptor for Unix/Linux
+#else
+    HANDLE epoll_fd_ = nullptr;  // wepoll handle for Windows (epoll-like API)
+#endif
+
     std::unordered_map<int, ClientInfo> clients_;
+    std::unordered_map<SocketT, int> socket_to_client_id_;
     std::atomic<int> next_client_id_{1};
 };