Move net-specific code to a separate library

resetius · Dec 27, 2024 · 186ac41 · 186ac41
1 parent f02d204
commit 186ac41
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,5 +9,6 @@ enable_testing()
 
 add_subdirectory(coroio/coroio)
 add_subdirectory(miniraft)
+add_subdirectory(miniraft/net)
 add_subdirectory(examples)
 add_subdirectory(test)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -4,9 +4,9 @@ macro(target name source)
   add_executable(${name} ${source})
   if (SQLite3_FOUND)
     target_include_directories(${name} PRIVATE ${SQLite3_INCLUDE_DIRS})
-    target_link_libraries(${name} PRIVATE miniraft coroio ${SQLite3_LIBRARIES})
+    target_link_libraries(${name} PRIVATE miniraft.net ${SQLite3_LIBRARIES})
   else()
-    target_link_libraries(${name} miniraft coroio)
+    target_link_libraries(${name} miniraft.net)
     endif()
 endmacro()
 

diff --git a/examples/client.cpp b/examples/client.cpp
@@ -2,7 +2,7 @@
 #include <coroio/socket.hpp>
 
 #include <miniraft/messages.h>
-#include <miniraft/server.h>
+#include <miniraft/net/server.h>
 
 #include <vector>
 #include <queue>

diff --git a/examples/kv.cpp b/examples/kv.cpp
@@ -1,6 +1,6 @@
 #include <string_view>
 
-#include <miniraft/server.h>
+#include <miniraft/net/server.h>
 #include <miniraft/persist.h>
 
 #include "kv.h"

diff --git a/examples/server.cpp b/examples/server.cpp
@@ -2,7 +2,7 @@
 #include <csignal>
 #include <miniraft/timesource.h>
 #include <miniraft/raft.h>
-#include <miniraft/server.h>
+#include <miniraft/net/server.h>
 
 void usage(const char* prog) {
     std::cerr << prog << " --id myid --node ip:port:id [--node ip:port:id ...]" << "\n";

diff --git a/examples/sql.cpp b/examples/sql.cpp
@@ -3,7 +3,7 @@
 
 #include <miniraft/raft.h>
 #include <miniraft/persist.h>
-#include <miniraft/server.h>
+#include <miniraft/net/server.h>
 
 struct TSqlEntry {
     uint32_t QuerySize = 0;

diff --git a/miniraft/CMakeLists.txt b/miniraft/CMakeLists.txt
@@ -1,10 +1,8 @@
 add_library(miniraft
     messages.cpp
     raft.cpp
-    server.cpp
     persist.cpp
 )
 
 target_include_directories(miniraft PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
-target_link_libraries(miniraft PUBLIC coroio)
 target_compile_features(miniraft PUBLIC cxx_std_20)
diff --git a/miniraft/net/CMakeLists.txt b/miniraft/net/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_library(miniraft.net
+    server.cpp
+)
+
+target_link_libraries(miniraft.net PUBLIC coroio miniraft)
+target_compile_features(miniraft.net PUBLIC cxx_std_20)
diff --git a/miniraft/server.cpp → miniraft/net/server.cpp b/miniraft/server.cpp → miniraft/net/server.cpp
@@ -4,9 +4,10 @@
 #include <iostream>
 #include <stdexcept>
 #include <vector>
-#include "raft.h"
+#include <miniraft/raft.h>
+#include <miniraft/messages.h>
+
 #include "server.h"
-#include "messages.h"
 
 template<typename TSocket>
 NNet::TValueTask<void> TMessageWriter<TSocket>::Write(TMessageHolder<TMessage> message) {

diff --git a/miniraft/server.h → miniraft/net/server.h b/miniraft/server.h → miniraft/net/server.h
@@ -9,9 +9,9 @@
 
 #include <coroio/all.hpp>
 
-#include "timesource.h"
-#include "messages.h"
-#include "raft.h"
+#include <miniraft/timesource.h>
+#include <miniraft/messages.h>
+#include <miniraft/raft.h>
 
 template<typename TSocket>
 class TMessageReader {

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,7 +5,7 @@ macro(ut name source)
   add_executable(${name} ${source})
   target_include_directories(${name} PRIVATE ${CMOCKA_INCLUDE_DIRS})
   target_link_directories(${name} PRIVATE ${CMOCKA_LIBRARY_DIRS})
-  target_link_libraries(${name} PRIVATE miniraft coroio ${CMOCKA_LIBRARIES})
+  target_link_libraries(${name} PRIVATE miniraft.net ${CMOCKA_LIBRARIES})
 
   add_test(NAME ${name} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
   set_tests_properties(${name} PROPERTIES ENVIRONMENT "CMOCKA_MESSAGE_OUTPUT=xml;CMOCKA_XML_FILE=${name}.xml")

diff --git a/test/test_read_write.cpp b/test/test_read_write.cpp
@@ -7,7 +7,7 @@
 
 #include <miniraft/messages.h>
 #include <miniraft/raft.h>
-#include <miniraft/server.h>
+#include <miniraft/net/server.h>
 #include <miniraft/timesource.h>
 #include <coroio/all.hpp>