From cb7f37f08bc5f37dc6a28208af48d3a20eee97c0 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 21 Sep 2020 11:19:15 +0200 Subject: [PATCH] Rename buffer project --- CMakeLists.txt | 3 +- sf-buffer-recv/CMakeLists.txt | 18 ++++++++++ {sf-buffer => sf-buffer-recv}/README.md | 0 .../include/FrameUdpReceiver.hpp | 0 .../include/PacketUdpReceiver.hpp | 0 .../src/FrameUdpReceiver.cpp | 0 .../src/PacketUdpReceiver.cpp | 0 {sf-buffer => sf-buffer-recv}/src/main.cpp | 0 sf-buffer-recv/test/CMakeLists.txt | 8 +++++ {sf-buffer => sf-buffer-recv}/test/main.cpp | 0 .../test/mock/udp.hpp | 0 .../test/test_FrameUdpReceiver.cpp | 0 .../test/test_PacketUdpReceiver.cpp | 0 sf-buffer-writer/src/main.cpp | 34 +++---------------- sf-buffer/CMakeLists.txt | 18 ---------- sf-buffer/test/CMakeLists.txt | 8 ----- 16 files changed, 32 insertions(+), 57 deletions(-) create mode 100644 sf-buffer-recv/CMakeLists.txt rename {sf-buffer => sf-buffer-recv}/README.md (100%) rename {sf-buffer => sf-buffer-recv}/include/FrameUdpReceiver.hpp (100%) rename {sf-buffer => sf-buffer-recv}/include/PacketUdpReceiver.hpp (100%) rename {sf-buffer => sf-buffer-recv}/src/FrameUdpReceiver.cpp (100%) rename {sf-buffer => sf-buffer-recv}/src/PacketUdpReceiver.cpp (100%) rename {sf-buffer => sf-buffer-recv}/src/main.cpp (100%) create mode 100644 sf-buffer-recv/test/CMakeLists.txt rename {sf-buffer => sf-buffer-recv}/test/main.cpp (100%) rename {sf-buffer => sf-buffer-recv}/test/mock/udp.hpp (100%) rename {sf-buffer => sf-buffer-recv}/test/test_FrameUdpReceiver.cpp (100%) rename {sf-buffer => sf-buffer-recv}/test/test_PacketUdpReceiver.cpp (100%) delete mode 100644 sf-buffer/CMakeLists.txt delete mode 100644 sf-buffer/test/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f67c4f0..c490a02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,8 @@ add_subdirectory( EXCLUDE_FROM_ALL) add_subdirectory("core-buffer") -add_subdirectory("sf-buffer") +add_subdirectory("sf-buffer-recv") add_subdirectory("sf-buffer-writer") add_subdirectory("sf-stream") add_subdirectory("sf-writer") #add_subdirectory("jf-live-writer") -#add_subdirectory("jf-live-daq") \ No newline at end of file diff --git a/sf-buffer-recv/CMakeLists.txt b/sf-buffer-recv/CMakeLists.txt new file mode 100644 index 0000000..f523a4f --- /dev/null +++ b/sf-buffer-recv/CMakeLists.txt @@ -0,0 +1,18 @@ +file(GLOB SOURCES + src/*.cpp) + +add_library(sf-buffer-recv-lib STATIC ${SOURCES}) +target_include_directories(sf-buffer-recv-lib PUBLIC include/) +target_link_libraries(sf-buffer-recv-lib + external + core-buffer-lib) + +add_executable(sf-buffer-recv src/main.cpp) +set_target_properties(sf-buffer-recv PROPERTIES OUTPUT_NAME sf_buffer) +target_link_libraries(sf-buffer-recv + sf-buffer-recv-lib + zmq + rt) + +enable_testing() +add_subdirectory(test/) diff --git a/sf-buffer/README.md b/sf-buffer-recv/README.md similarity index 100% rename from sf-buffer/README.md rename to sf-buffer-recv/README.md diff --git a/sf-buffer/include/FrameUdpReceiver.hpp b/sf-buffer-recv/include/FrameUdpReceiver.hpp similarity index 100% rename from sf-buffer/include/FrameUdpReceiver.hpp rename to sf-buffer-recv/include/FrameUdpReceiver.hpp diff --git a/sf-buffer/include/PacketUdpReceiver.hpp b/sf-buffer-recv/include/PacketUdpReceiver.hpp similarity index 100% rename from sf-buffer/include/PacketUdpReceiver.hpp rename to sf-buffer-recv/include/PacketUdpReceiver.hpp diff --git a/sf-buffer/src/FrameUdpReceiver.cpp b/sf-buffer-recv/src/FrameUdpReceiver.cpp similarity index 100% rename from sf-buffer/src/FrameUdpReceiver.cpp rename to sf-buffer-recv/src/FrameUdpReceiver.cpp diff --git a/sf-buffer/src/PacketUdpReceiver.cpp b/sf-buffer-recv/src/PacketUdpReceiver.cpp similarity index 100% rename from sf-buffer/src/PacketUdpReceiver.cpp rename to sf-buffer-recv/src/PacketUdpReceiver.cpp diff --git a/sf-buffer/src/main.cpp b/sf-buffer-recv/src/main.cpp similarity index 100% rename from sf-buffer/src/main.cpp rename to sf-buffer-recv/src/main.cpp diff --git a/sf-buffer-recv/test/CMakeLists.txt b/sf-buffer-recv/test/CMakeLists.txt new file mode 100644 index 0000000..a03fdca --- /dev/null +++ b/sf-buffer-recv/test/CMakeLists.txt @@ -0,0 +1,8 @@ +add_executable(sf-buffer-recv-tests main.cpp) + +target_link_libraries(sf-buffer-recv-tests + core-buffer-lib + sf-buffer-recv-lib + gtest + ) + diff --git a/sf-buffer/test/main.cpp b/sf-buffer-recv/test/main.cpp similarity index 100% rename from sf-buffer/test/main.cpp rename to sf-buffer-recv/test/main.cpp diff --git a/sf-buffer/test/mock/udp.hpp b/sf-buffer-recv/test/mock/udp.hpp similarity index 100% rename from sf-buffer/test/mock/udp.hpp rename to sf-buffer-recv/test/mock/udp.hpp diff --git a/sf-buffer/test/test_FrameUdpReceiver.cpp b/sf-buffer-recv/test/test_FrameUdpReceiver.cpp similarity index 100% rename from sf-buffer/test/test_FrameUdpReceiver.cpp rename to sf-buffer-recv/test/test_FrameUdpReceiver.cpp diff --git a/sf-buffer/test/test_PacketUdpReceiver.cpp b/sf-buffer-recv/test/test_PacketUdpReceiver.cpp similarity index 100% rename from sf-buffer/test/test_PacketUdpReceiver.cpp rename to sf-buffer-recv/test/test_PacketUdpReceiver.cpp diff --git a/sf-buffer-writer/src/main.cpp b/sf-buffer-writer/src/main.cpp index 8b14409..bcc33ba 100644 --- a/sf-buffer-writer/src/main.cpp +++ b/sf-buffer-writer/src/main.cpp @@ -15,33 +15,6 @@ using namespace std; using namespace chrono; using namespace buffer_config; -void* get_live_stream_socket(const string& detector_name, const int source_id) -{ - stringstream ipc_stream; - string LIVE_IPC_URL = BUFFER_LIVE_IPC_URL + detector_name + "-"; - ipc_stream << LIVE_IPC_URL << source_id; - const auto ipc_address = ipc_stream.str(); - - void* ctx = zmq_ctx_new(); - void* socket = zmq_socket(ctx, ZMQ_PUB); - - const int sndhwm = BUFFER_ZMQ_SNDHWM; - if (zmq_setsockopt(socket, ZMQ_SNDHWM, &sndhwm, sizeof(sndhwm)) != 0) { - throw runtime_error(zmq_strerror(errno)); - } - - const int linger = 0; - if (zmq_setsockopt(socket, ZMQ_LINGER, &linger, sizeof(linger)) != 0) { - throw runtime_error(zmq_strerror(errno)); - } - - if (zmq_bind(socket, ipc_address.c_str()) != 0) { - throw runtime_error(zmq_strerror(errno)); - } - - return socket; -} - int main (int argc, char *argv[]) { if (argc != 6) { @@ -67,16 +40,19 @@ int main (int argc, char *argv[]) { string root_folder = string(argv[5]); int source_id = atoi(argv[6]); + + string LIVE_IPC_URL = BUFFER_LIVE_IPC_URL + detector_name + "-"; + ipc_stream << LIVE_IPC_URL << source_id; + const auto ipc_address = ipc_stream.str(); + uint64_t stats_counter(0); uint64_t n_missed_packets = 0; uint64_t n_corrupted_frames = 0; BufferBinaryWriter writer(root_folder, device_name); - FrameUdpReceiver receiver(udp_port, source_id); RamBuffer buffer(detector_name, n_modules); auto binary_buffer = new BufferBinaryFormat(); - auto socket = get_live_stream_socket(detector_name, source_id); while (true) { diff --git a/sf-buffer/CMakeLists.txt b/sf-buffer/CMakeLists.txt deleted file mode 100644 index bbd2cfe..0000000 --- a/sf-buffer/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -file(GLOB SOURCES - src/*.cpp) - -add_library(sf-buffer-lib STATIC ${SOURCES}) -target_include_directories(sf-buffer-lib PUBLIC include/) -target_link_libraries(sf-buffer-lib - external - core-buffer-lib) - -add_executable(sf-buffer src/main.cpp) -set_target_properties(sf-buffer PROPERTIES OUTPUT_NAME sf_buffer) -target_link_libraries(sf-buffer - sf-buffer-lib - zmq - rt) - -enable_testing() -add_subdirectory(test/) diff --git a/sf-buffer/test/CMakeLists.txt b/sf-buffer/test/CMakeLists.txt deleted file mode 100644 index 4ae80a8..0000000 --- a/sf-buffer/test/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -add_executable(sf-buffer-tests main.cpp) - -target_link_libraries(sf-buffer-tests - core-buffer-lib - sf-buffer-lib - gtest - ) -