From 7879c3c3ea8402580b6f1c3e122f7bca3d3b08e1 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Fri, 2 Jul 2021 14:41:48 +0200 Subject: [PATCH] Move JF specific receiver to generic --- CMakeLists.txt | 2 +- jf-udp-recv/CMakeLists.txt | 26 ------------------- std-udp-recv/CMakeLists.txt | 26 +++++++++++++++++++ {jf-udp-recv => std-udp-recv}/README.md | 0 .../include/FrameStats.hpp | 0 .../include/FrameUdpReceiver.hpp | 0 .../include/PacketUdpReceiver.hpp | 0 .../src/FrameStats.cpp | 0 .../src/FrameUdpReceiver.cpp | 0 .../src/PacketUdpReceiver.cpp | 0 {jf-udp-recv => std-udp-recv}/src/main.cpp | 15 +++++------ .../test/CMakeLists.txt | 0 {jf-udp-recv => std-udp-recv}/test/main.cpp | 0 .../test/mock/udp.hpp | 0 .../test/test_FrameUdpReceiver.cpp | 0 .../test/test_PacketUdpReceiver.cpp | 0 16 files changed, 33 insertions(+), 36 deletions(-) delete mode 100644 jf-udp-recv/CMakeLists.txt create mode 100644 std-udp-recv/CMakeLists.txt rename {jf-udp-recv => std-udp-recv}/README.md (100%) rename {jf-udp-recv => std-udp-recv}/include/FrameStats.hpp (100%) rename {jf-udp-recv => std-udp-recv}/include/FrameUdpReceiver.hpp (100%) rename {jf-udp-recv => std-udp-recv}/include/PacketUdpReceiver.hpp (100%) rename {jf-udp-recv => std-udp-recv}/src/FrameStats.cpp (100%) rename {jf-udp-recv => std-udp-recv}/src/FrameUdpReceiver.cpp (100%) rename {jf-udp-recv => std-udp-recv}/src/PacketUdpReceiver.cpp (100%) rename {jf-udp-recv => std-udp-recv}/src/main.cpp (79%) rename {jf-udp-recv => std-udp-recv}/test/CMakeLists.txt (100%) rename {jf-udp-recv => std-udp-recv}/test/main.cpp (100%) rename {jf-udp-recv => std-udp-recv}/test/mock/udp.hpp (100%) rename {jf-udp-recv => std-udp-recv}/test/test_FrameUdpReceiver.cpp (100%) rename {jf-udp-recv => std-udp-recv}/test/test_PacketUdpReceiver.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07b6e21..4365202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ add_subdirectory( EXCLUDE_FROM_ALL) add_subdirectory("core-buffer") -add_subdirectory("jf-udp-recv") +add_subdirectory("std-udp-recv") #add_subdirectory("jf-buffer-writer") add_subdirectory("jf-assembler") add_subdirectory("sf-stream") diff --git a/jf-udp-recv/CMakeLists.txt b/jf-udp-recv/CMakeLists.txt deleted file mode 100644 index 3667afb..0000000 --- a/jf-udp-recv/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -file(GLOB SOURCES - src/*.cpp) - -add_library(jf-udp-recv-lib STATIC ${SOURCES}) -target_include_directories(jf-udp-recv-lib PUBLIC include/) -target_link_libraries(jf-udp-recv-lib - external - core-buffer-lib) - -add_executable(jf-udp-recv src/main.cpp) - -if (USE_EIGER) - set (LIB_NAME_UDP_RECV "eiger_udp_recv") -else() - set (LIB_NAME_UDP_RECV "jf_udp_recv") -endif() - -set_target_properties(jf-udp-recv PROPERTIES OUTPUT_NAME ${LIB_NAME_UDP_RECV}) - -target_link_libraries(jf-udp-recv - jf-udp-recv-lib - zmq - rt) - -enable_testing() -add_subdirectory(test/) diff --git a/std-udp-recv/CMakeLists.txt b/std-udp-recv/CMakeLists.txt new file mode 100644 index 0000000..324e603 --- /dev/null +++ b/std-udp-recv/CMakeLists.txt @@ -0,0 +1,26 @@ +file(GLOB SOURCES + src/*.cpp) + +add_library(std-udp-recv-lib STATIC ${SOURCES}) +target_include_directories(std-udp-recv-lib PUBLIC include/) +target_link_libraries(std-udp-recv-lib + external + core-buffer-lib) + +add_executable(std-udp-recv src/main.cpp) + +if (USE_EIGER) + set (LIB_NAME_UDP_RECV "eiger_udp_recv") +else() + set (LIB_NAME_UDP_RECV "jf_udp_recv") +endif() + +set_target_properties(std-udp-recv PROPERTIES OUTPUT_NAME ${LIB_NAME_UDP_RECV}) + +target_link_libraries(std-udp-recv + std-udp-recv-lib + zmq + rt) + +enable_testing() +add_subdirectory(test/) diff --git a/jf-udp-recv/README.md b/std-udp-recv/README.md similarity index 100% rename from jf-udp-recv/README.md rename to std-udp-recv/README.md diff --git a/jf-udp-recv/include/FrameStats.hpp b/std-udp-recv/include/FrameStats.hpp similarity index 100% rename from jf-udp-recv/include/FrameStats.hpp rename to std-udp-recv/include/FrameStats.hpp diff --git a/jf-udp-recv/include/FrameUdpReceiver.hpp b/std-udp-recv/include/FrameUdpReceiver.hpp similarity index 100% rename from jf-udp-recv/include/FrameUdpReceiver.hpp rename to std-udp-recv/include/FrameUdpReceiver.hpp diff --git a/jf-udp-recv/include/PacketUdpReceiver.hpp b/std-udp-recv/include/PacketUdpReceiver.hpp similarity index 100% rename from jf-udp-recv/include/PacketUdpReceiver.hpp rename to std-udp-recv/include/PacketUdpReceiver.hpp diff --git a/jf-udp-recv/src/FrameStats.cpp b/std-udp-recv/src/FrameStats.cpp similarity index 100% rename from jf-udp-recv/src/FrameStats.cpp rename to std-udp-recv/src/FrameStats.cpp diff --git a/jf-udp-recv/src/FrameUdpReceiver.cpp b/std-udp-recv/src/FrameUdpReceiver.cpp similarity index 100% rename from jf-udp-recv/src/FrameUdpReceiver.cpp rename to std-udp-recv/src/FrameUdpReceiver.cpp diff --git a/jf-udp-recv/src/PacketUdpReceiver.cpp b/std-udp-recv/src/PacketUdpReceiver.cpp similarity index 100% rename from jf-udp-recv/src/PacketUdpReceiver.cpp rename to std-udp-recv/src/PacketUdpReceiver.cpp diff --git a/jf-udp-recv/src/main.cpp b/std-udp-recv/src/main.cpp similarity index 79% rename from jf-udp-recv/src/main.cpp rename to std-udp-recv/src/main.cpp index b2e84fc..4db9263 100644 --- a/jf-udp-recv/src/main.cpp +++ b/std-udp-recv/src/main.cpp @@ -20,27 +20,24 @@ int main (int argc, char *argv[]) { if (argc != 4) { cout << endl; - #ifndef USE_EIGER - cout << "Usage: jf_udp_recv [detector_json_filename] [module_id] [bit_depth]"; - #else - cout << "Usage: eiger_udp_recv [detector_json_filename] [module_id] [bit_depth]"; - #endif + + cout << "Usage: std_udp_recv [udp_recv_config_filename] [module_id] [bit_depth]"; cout << endl; - cout << "\tdetector_json_filename: detector config file path." << endl; + cout << "\tudp_recv_config_filename: detector config file path." << endl; cout << "\tmodule_id: id of the module for this process." << endl; cout << "\tbit_depth: bit depth of the incoming udp packets." << endl; cout << endl; exit(-1); } - const auto config = read_json_config(string(argv[1])); + const auto config = UdpRecvConfig.from_json_file(string(argv[1])); const int module_id = atoi(argv[2]); const int bit_depth = atoi(argv[3]); const int n_receivers = config.n_modules * config.n_submodules; const auto udp_port = config.start_udp_port + module_id; FrameUdpReceiver receiver(module_id, udp_port, n_receivers, config.n_submodules, bit_depth); - RamBuffer buffer(config.detector_name, n_receivers, config.n_submodules, bit_depth); + RamBuffer frame_buffer(config.detector_name, n_receivers, config.n_submodules, bit_depth); FrameStats stats(config.detector_name, n_receivers, module_id, bit_depth, STATS_TIME); auto ctx = zmq_ctx_new(); @@ -62,7 +59,7 @@ int main (int argc, char *argv[]) { ( (meta.frame_index-frame_index_previous) > 1000 ) ){ bad_pulse_id = true; } else { - buffer.write_frame(meta, data); + frame_buffer.write_frame(meta, data); zmq_send(socket, &pulse_id, sizeof(pulse_id), 0); diff --git a/jf-udp-recv/test/CMakeLists.txt b/std-udp-recv/test/CMakeLists.txt similarity index 100% rename from jf-udp-recv/test/CMakeLists.txt rename to std-udp-recv/test/CMakeLists.txt diff --git a/jf-udp-recv/test/main.cpp b/std-udp-recv/test/main.cpp similarity index 100% rename from jf-udp-recv/test/main.cpp rename to std-udp-recv/test/main.cpp diff --git a/jf-udp-recv/test/mock/udp.hpp b/std-udp-recv/test/mock/udp.hpp similarity index 100% rename from jf-udp-recv/test/mock/udp.hpp rename to std-udp-recv/test/mock/udp.hpp diff --git a/jf-udp-recv/test/test_FrameUdpReceiver.cpp b/std-udp-recv/test/test_FrameUdpReceiver.cpp similarity index 100% rename from jf-udp-recv/test/test_FrameUdpReceiver.cpp rename to std-udp-recv/test/test_FrameUdpReceiver.cpp diff --git a/jf-udp-recv/test/test_PacketUdpReceiver.cpp b/std-udp-recv/test/test_PacketUdpReceiver.cpp similarity index 100% rename from jf-udp-recv/test/test_PacketUdpReceiver.cpp rename to std-udp-recv/test/test_PacketUdpReceiver.cpp