From f7dc2be75f11170f43aaec4491c4794f4ebd1d92 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Fri, 17 Apr 2020 09:51:16 +0200
Subject: [PATCH] Make core-buffer folder with all common stuff used in the
 buffer

---
 CMakeLists.txt                                      |  1 +
 core-buffer/CMakeLists.txt                          | 13 +++++++++++++
 .../src => core-buffer/include}/buffer_utils.hpp    |  0
 .../receiver => core-buffer/src}/UdpReceiver.cpp    |  0
 .../module => core-buffer/src}/UdpRecvModule.cpp    |  0
 core-buffer/test/CMakeLists.txt                     |  5 +++++
 {core-writer => core-buffer}/test/mock/udp.hpp      |  0
 .../test/test_UdpReceiver.cpp                       |  0
 .../test/test_UdpRecvModule.cpp                     |  0
 .../test/test_buffer_utils.cpp                      |  2 +-
 core-buffer/test/test_main.cpp                      | 11 +++++++++++
 core-writer/CMakeLists.txt                          |  1 +
 core-writer/test/test_main.cpp                      |  2 --
 sf-buffer/CMakeLists.txt                            |  1 +
 sf-buffer/test/test_main.cpp                        |  1 -
 15 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 core-buffer/CMakeLists.txt
 rename {sf-buffer/src => core-buffer/include}/buffer_utils.hpp (100%)
 rename {core-writer/src/receiver => core-buffer/src}/UdpReceiver.cpp (100%)
 rename {core-writer/src/module => core-buffer/src}/UdpRecvModule.cpp (100%)
 create mode 100644 core-buffer/test/CMakeLists.txt
 rename {core-writer => core-buffer}/test/mock/udp.hpp (100%)
 rename {core-writer => core-buffer}/test/test_UdpReceiver.cpp (100%)
 rename {core-writer => core-buffer}/test/test_UdpRecvModule.cpp (100%)
 rename {sf-buffer => core-buffer}/test/test_buffer_utils.cpp (96%)
 create mode 100644 core-buffer/test/test_main.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdf3ab4..a25634f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ add_subdirectory(
         ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
         EXCLUDE_FROM_ALL)
 
+add_subdirectory("core-buffer")
 add_subdirectory("core-writer")
 #add_subdirectory("csaxs")
 add_subdirectory("sf-writer")
diff --git a/core-buffer/CMakeLists.txt b/core-buffer/CMakeLists.txt
new file mode 100644
index 0000000..78a8d21
--- /dev/null
+++ b/core-buffer/CMakeLists.txt
@@ -0,0 +1,13 @@
+file(GLOB SOURCES
+        src/*.cpp)
+
+add_library(core-buffer STATIC ${SOURCES})
+target_include_directories(core-buffer PUBLIC include/)
+target_link_libraries(core-buffer core-writer)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    target_compile_definitions(core-buffer PRIVATE DEBUG_OUTPUT)
+endif()
+
+enable_testing()
+add_subdirectory(test/)
\ No newline at end of file
diff --git a/sf-buffer/src/buffer_utils.hpp b/core-buffer/include/buffer_utils.hpp
similarity index 100%
rename from sf-buffer/src/buffer_utils.hpp
rename to core-buffer/include/buffer_utils.hpp
diff --git a/core-writer/src/receiver/UdpReceiver.cpp b/core-buffer/src/UdpReceiver.cpp
similarity index 100%
rename from core-writer/src/receiver/UdpReceiver.cpp
rename to core-buffer/src/UdpReceiver.cpp
diff --git a/core-writer/src/module/UdpRecvModule.cpp b/core-buffer/src/UdpRecvModule.cpp
similarity index 100%
rename from core-writer/src/module/UdpRecvModule.cpp
rename to core-buffer/src/UdpRecvModule.cpp
diff --git a/core-buffer/test/CMakeLists.txt b/core-buffer/test/CMakeLists.txt
new file mode 100644
index 0000000..00ef939
--- /dev/null
+++ b/core-buffer/test/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable(core-buffer_tests test_main.cpp)
+
+target_link_libraries(core-buffer_tests
+        core-buffer
+        gtest)
\ No newline at end of file
diff --git a/core-writer/test/mock/udp.hpp b/core-buffer/test/mock/udp.hpp
similarity index 100%
rename from core-writer/test/mock/udp.hpp
rename to core-buffer/test/mock/udp.hpp
diff --git a/core-writer/test/test_UdpReceiver.cpp b/core-buffer/test/test_UdpReceiver.cpp
similarity index 100%
rename from core-writer/test/test_UdpReceiver.cpp
rename to core-buffer/test/test_UdpReceiver.cpp
diff --git a/core-writer/test/test_UdpRecvModule.cpp b/core-buffer/test/test_UdpRecvModule.cpp
similarity index 100%
rename from core-writer/test/test_UdpRecvModule.cpp
rename to core-buffer/test/test_UdpRecvModule.cpp
diff --git a/sf-buffer/test/test_buffer_utils.cpp b/core-buffer/test/test_buffer_utils.cpp
similarity index 96%
rename from sf-buffer/test/test_buffer_utils.cpp
rename to core-buffer/test/test_buffer_utils.cpp
index 435a56f..999bcb4 100644
--- a/sf-buffer/test/test_buffer_utils.cpp
+++ b/core-buffer/test/test_buffer_utils.cpp
@@ -1,5 +1,5 @@
 #include "gtest/gtest.h"
-#include "../src/buffer_utils.hpp"
+#include "buffer_utils.hpp"
 
 using namespace std;
 
diff --git a/core-buffer/test/test_main.cpp b/core-buffer/test/test_main.cpp
new file mode 100644
index 0000000..d3dc429
--- /dev/null
+++ b/core-buffer/test/test_main.cpp
@@ -0,0 +1,11 @@
+#include "gtest/gtest.h"
+#include "test_UdpReceiver.cpp"
+#include "test_UdpRecvModule.cpp"
+#include "test_buffer_utils.cpp"
+
+using namespace std;
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/core-writer/CMakeLists.txt b/core-writer/CMakeLists.txt
index cf0e5bb..02f13f8 100644
--- a/core-writer/CMakeLists.txt
+++ b/core-writer/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(core-writer STATIC ${SOURCES})
 include_directories(core-writer external/)
 
 target_include_directories(core-writer PUBLIC include/)
+target_include_directories(core-writer PUBLIC external/)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     target_compile_definitions(core-writer PRIVATE DEBUG_OUTPUT)
diff --git a/core-writer/test/test_main.cpp b/core-writer/test/test_main.cpp
index 02b57b8..b0718cb 100644
--- a/core-writer/test/test_main.cpp
+++ b/core-writer/test/test_main.cpp
@@ -6,8 +6,6 @@
 #include "test_ZmqRecvModule.cpp"
 #include "test_H5WriteModule.cpp"
 #include "test_ProcessManager.cpp"
-#include "test_UdpReceiver.cpp"
-#include "test_UdpRecvModule.cpp"
 
 using namespace std;
 
diff --git a/sf-buffer/CMakeLists.txt b/sf-buffer/CMakeLists.txt
index 76f1adf..43c5165 100644
--- a/sf-buffer/CMakeLists.txt
+++ b/sf-buffer/CMakeLists.txt
@@ -4,6 +4,7 @@ set_target_properties(sf-buffer PROPERTIES OUTPUT_NAME sf_buffer)
 target_include_directories(sf-buffer PUBLIC src/)
 
 target_link_libraries(sf-buffer
+        core-buffer
         core-writer
         external
         zmq
diff --git a/sf-buffer/test/test_main.cpp b/sf-buffer/test/test_main.cpp
index ae3a22a..e819294 100644
--- a/sf-buffer/test/test_main.cpp
+++ b/sf-buffer/test/test_main.cpp
@@ -1,5 +1,4 @@
 #include "gtest/gtest.h"
-#include "test_buffer_utils.cpp"
 
 using namespace std;