sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-05-01 04:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Makefiles

Browse Source
This commit is contained in:
U-PSICH\mohacsi_i
2021-06-21 10:42:36 +02:00
parent 71153ec9fd
commit 3fc87e1740
6 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1
View File
@@ -35,6 +35,7 @@ add_subdirectory("jf-udp-recv")
add_subdirectory("jf-buffer-writer")
add_subdirectory("jf-assembler")
add_subdirectory("jfj-udp-recv")
add_subdirectory("jfj-combined")
add_subdirectory("sf-stream")
add_subdirectory("sf-writer")
jfj-combined/CMakeLists.txt
+3 -3
View File
@@ -4,9 +4,9 @@ add_library(jfj-combined-lib STATIC ${SOURCES})
target_include_directories(jfj-combined-lib PUBLIC include/)
target_link_libraries(jfj-combined-lib external core-buffer-lib)
add_executable(jfj-combined src/main.cpp)
set_target_properties(jfj-combined PROPERTIES OUTPUT_NAME jf_udp_recv)
add_executable(jfj-combined src/dummyMain.cpp)
set_target_properties(jfj-combined PROPERTIES OUTPUT_NAME jf_combined)
target_link_libraries(jfj-combined jfj-combined-lib zmq rt)
enable_testing()
add_subdirectory(test/)
add_subdirectory(test/)
jfj-combined/include/JfjFrameWorker.hpp
+1 -1
View File
@@ -30,7 +30,7 @@ class JfjFrameWorker {
public:
JfjFrameUdpReceiver(const uint16_t port, std::function<void(uint64_t index, uint32_t module, char* ptr_data, ModuleFrame* ptr_meta)> callback);
virtual ~JfjFrameUdpReceiver();
uint64_t get_frame_from_udp(ModuleFrame& metadata, char* frame_buffer);
std::generator<uint64_t> get_frame_from_udp(ModuleFrame& metadata, char* frame_buffer);
void run();
};
jfj-combined/src/JfjFrameWorker.cpp
+25 -25
View File
@@ -60,31 +60,31 @@ inline uint64_t JfjFrameWorker::process_packets(ModuleFrame& metadata, char* fra
return 0;
}
uint64_t JfjFrameWorker::get_frame_from_udp(ModuleFrame& metadata, char* frame_buffer){
// Reset the metadata and frame buffer for the next frame. (really needed?)
metadata.pulse_id = 0;
metadata.n_recv_packets = 0;
memset(frame_buffer, 0, m_num_data_bytes);
// Process leftover packages in the buffer
if (!m_buffer.is_empty()) {
auto pulse_id = process_packets(metadata, frame_buffer);
if (pulse_id != 0) { return pulse_id; }
}
while (true) {
// Receive new packages (pass if none)...
m_buffer.fill_from(m_udp_receiver);
if (m_buffer.is_empty()) { continue; }
// ... and process them
auto pulse_id = process_packets(metadata, frame_buffer);
if (pulse_id != 0) { return pulse_id; }
}
}
//uint64_t JfjFrameWorker::get_frame_from_udp(ModuleFrame& metadata, char* frame_buffer){
// // Reset the metadata and frame buffer for the next frame. (really needed?)
// metadata.pulse_id = 0;
// metadata.n_recv_packets = 0;
// memset(frame_buffer, 0, m_num_data_bytes);
//
//
// // Process leftover packages in the buffer
// if (!m_buffer.is_empty()) {
// auto pulse_id = process_packets(metadata, frame_buffer);
// if (pulse_id != 0) { return pulse_id; }
// }
//
//
// while (true) {
// // Receive new packages (pass if none)...
// m_buffer.fill_from(m_udp_receiver);
// if (m_buffer.is_empty()) { continue; }
//
// // ... and process them
// auto pulse_id = process_packets(metadata, frame_buffer);
// if (pulse_id != 0) { return pulse_id; }
// }
//}
//
jfj-combined/src/dummyMain.cpp
+6 -6
View File
@@ -16,12 +16,12 @@ void dummy_sender(ImageMetadata* meta, std::vector<char>* data){
int main (int argc, char *argv[]) {
FrameCache cache(32, 3, JFJOCH_DATA_BYTES_PER_MODULE, &dummy_sender);
JfjFrameWorker W0(5340, 0, cache.emplace);
JfjFrameWorker W1(5341, 1, cache.emplace);
JfjFrameWorker W2(5342, 2, cache.emplace);
JfjFrameWorker W0(5005, 0, cache.emplace);
JfjFrameWorker W1(5006, 1, cache.emplace);
JfjFrameWorker W2(5007, 2, cache.emplace);
}
jfj-combined/test/CMakeLists.txt
+3 -3
View File
@@ -1,8 +1,8 @@
add_executable(jfj-udp-recv-tests main.cpp)
add_executable(jfj-combined-tests main.cpp)
target_link_libraries(jfj-udp-recv-tests
target_link_libraries(jfj-combined-tests
core-buffer-lib
jfj-udp-recv-lib
jfj-combined-lib
gtest
)