From b3fc52e2504373caa33315ac882fe840ffc61159 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 4 Jun 2020 10:24:40 +0200 Subject: [PATCH] Shorten name of n_recv_packets --- core-buffer/include/formats.hpp | 2 +- core-buffer/test/test_FastQueue.cpp | 4 ++-- sf-buffer/src/BufferUdpReceiver.cpp | 4 ++-- sf-buffer/src/main.cpp | 4 ++-- sf-buffer/test/test_BufferBinaryWriter.cpp | 8 ++++---- sf-buffer/test/test_BufferUdpReceiver.cpp | 8 ++++---- sf-stream/src/main.cpp | 4 ++-- sf-writer/src/ImageAssembler.cpp | 4 ++-- sf-writer/test/test_ImageAssembler.cpp | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core-buffer/include/formats.hpp b/core-buffer/include/formats.hpp index 0023f62..23526e3 100644 --- a/core-buffer/include/formats.hpp +++ b/core-buffer/include/formats.hpp @@ -10,7 +10,7 @@ struct ModuleFrame { uint64_t pulse_id; uint64_t frame_index; uint64_t daq_rec; - uint64_t n_received_packets; + uint64_t n_recv_packets; uint64_t module_id; }; #pragma pack(pop) diff --git a/core-buffer/test/test_FastQueue.cpp b/core-buffer/test/test_FastQueue.cpp index e720c21..502e705 100644 --- a/core-buffer/test/test_FastQueue.cpp +++ b/core-buffer/test/test_FastQueue.cpp @@ -128,7 +128,7 @@ TEST(FaseQueue, array_parameter) frame.pulse_id = i_module; frame.frame_index = i_module; frame.daq_rec = i_module; - frame.n_received_packets = i_module; + frame.n_recv_packets = i_module; frame.module_id = i_module; ModuleFrame* p_metadata = &module_metadata; @@ -142,7 +142,7 @@ TEST(FaseQueue, array_parameter) ASSERT_EQ(module_metadata.pulse_id, i_module); ASSERT_EQ(module_metadata.frame_index, i_module); ASSERT_EQ(module_metadata.daq_rec, i_module); - ASSERT_EQ(module_metadata.n_received_packets, i_module); + ASSERT_EQ(module_metadata.n_recv_packets, i_module); ASSERT_EQ(module_metadata.module_id, i_module); } } diff --git a/sf-buffer/src/BufferUdpReceiver.cpp b/sf-buffer/src/BufferUdpReceiver.cpp index ddab5c2..b080e14 100644 --- a/sf-buffer/src/BufferUdpReceiver.cpp +++ b/sf-buffer/src/BufferUdpReceiver.cpp @@ -46,7 +46,7 @@ inline void BufferUdpReceiver::copy_packet_to_buffers( packet_buffer_[i_packet].data, JUNGFRAU_DATA_BYTES_PER_PACKET); - metadata.n_received_packets++; + metadata.n_recv_packets++; } inline uint64_t BufferUdpReceiver::process_packets( @@ -105,7 +105,7 @@ uint64_t BufferUdpReceiver::get_frame_from_udp( { // Reset the metadata and frame buffer for the next frame. metadata.pulse_id = 0; - metadata.n_received_packets = 0; + metadata.n_recv_packets = 0; memset(frame_buffer, 0, JUNGFRAU_DATA_BYTES_PER_FRAME); // Happens when last packet from previous frame was missed. diff --git a/sf-buffer/src/main.cpp b/sf-buffer/src/main.cpp index 53aed23..48678b5 100644 --- a/sf-buffer/src/main.cpp +++ b/sf-buffer/src/main.cpp @@ -109,9 +109,9 @@ int main (int argc, char *argv[]) { send_max_us = send_us_duration; } - if (binary_buffer->metadata.n_received_packets < JF_N_PACKETS_PER_FRAME) { + if (binary_buffer->metadata.n_recv_packets < JF_N_PACKETS_PER_FRAME) { n_missed_packets += JF_N_PACKETS_PER_FRAME - - binary_buffer->metadata.n_received_packets; + binary_buffer->metadata.n_recv_packets; n_corrupted_frames++; } diff --git a/sf-buffer/test/test_BufferBinaryWriter.cpp b/sf-buffer/test/test_BufferBinaryWriter.cpp index eee5557..05e2f2c 100644 --- a/sf-buffer/test/test_BufferBinaryWriter.cpp +++ b/sf-buffer/test/test_BufferBinaryWriter.cpp @@ -15,7 +15,7 @@ TEST(BinaryWriter, basic_interaction) frame_data.metadata.pulse_id = 1; frame_data.metadata.frame_index = 2; frame_data.metadata.daq_rec = 3; - frame_data.metadata.n_received_packets = 4; + frame_data.metadata.n_recv_packets = 4; writer.write(5, &frame_data); @@ -36,8 +36,8 @@ TEST(BinaryWriter, basic_interaction) ASSERT_EQ(frame_data.metadata.pulse_id, read_data.metadata.pulse_id); ASSERT_EQ(frame_data.metadata.frame_index, read_data.metadata.frame_index); ASSERT_EQ(frame_data.metadata.daq_rec, read_data.metadata.daq_rec); - ASSERT_EQ(frame_data.metadata.n_received_packets, - read_data.metadata.n_received_packets); + ASSERT_EQ(frame_data.metadata.n_recv_packets, + read_data.metadata.n_recv_packets); } TEST(BinaryWriter, test_format_marker) @@ -52,7 +52,7 @@ TEST(BinaryWriter, test_format_marker) frame_data.metadata.pulse_id = 1; frame_data.metadata.frame_index = 2; frame_data.metadata.daq_rec = 3; - frame_data.metadata.n_received_packets = 4; + frame_data.metadata.n_recv_packets = 4; writer.write(5, &frame_data); diff --git a/sf-buffer/test/test_BufferUdpReceiver.cpp b/sf-buffer/test/test_BufferUdpReceiver.cpp index 352eaa3..fcf2ec9 100644 --- a/sf-buffer/test/test_BufferUdpReceiver.cpp +++ b/sf-buffer/test/test_BufferUdpReceiver.cpp @@ -56,7 +56,7 @@ TEST(BufferUdpReceiver, simple_recv) ASSERT_EQ(metadata.frame_index, i_frame + 1000); ASSERT_EQ(metadata.daq_rec, i_frame + 10000); // -1 because we skipped a packet. - ASSERT_EQ(metadata.n_received_packets, n_packets); + ASSERT_EQ(metadata.n_recv_packets, n_packets); ASSERT_EQ(metadata.module_id, source_id); } @@ -114,7 +114,7 @@ TEST(BufferUdpReceiver, missing_middle_packet) ASSERT_EQ(metadata.frame_index, i_frame + 1000); ASSERT_EQ(metadata.daq_rec, i_frame + 10000); // -1 because we skipped a packet. - ASSERT_EQ(metadata.n_received_packets, n_packets-1); + ASSERT_EQ(metadata.n_recv_packets, n_packets - 1); ASSERT_EQ(metadata.module_id, source_id); } @@ -172,7 +172,7 @@ TEST(BufferUdpReceiver, missing_first_packet) ASSERT_EQ(metadata.frame_index, i_frame + 1000); ASSERT_EQ(metadata.daq_rec, i_frame + 10000); // -1 because we skipped a packet. - ASSERT_EQ(metadata.n_received_packets, n_packets-1); + ASSERT_EQ(metadata.n_recv_packets, n_packets - 1); ASSERT_EQ(metadata.module_id, source_id); } @@ -231,7 +231,7 @@ TEST(BufferUdpReceiver, missing_last_packet) ASSERT_EQ(metadata.frame_index, i_frame + 1000); ASSERT_EQ(metadata.daq_rec, i_frame + 10000); // -1 because we skipped a packet. - ASSERT_EQ(metadata.n_received_packets, n_packets-1); + ASSERT_EQ(metadata.n_recv_packets, n_packets - 1); ASSERT_EQ(metadata.module_id, source_id); } diff --git a/sf-stream/src/main.cpp b/sf-stream/src/main.cpp index d9a4b45..e539907 100644 --- a/sf-stream/src/main.cpp +++ b/sf-stream/src/main.cpp @@ -116,7 +116,7 @@ int main (int argc, char *argv[]) frame_index = module_metadata.frame_index; daq_rec = module_metadata.daq_rec; - if ( module_metadata.n_received_packets != 128 ) is_good_frame = false; + if (module_metadata.n_recv_packets != 128 ) is_good_frame = false; } else { if (module_metadata.pulse_id != pulse_id) is_good_frame = false; @@ -124,7 +124,7 @@ int main (int argc, char *argv[]) if (module_metadata.daq_rec != daq_rec) is_good_frame = false; - if (module_metadata.n_received_packets != 128 ) is_good_frame = false; + if (module_metadata.n_recv_packets != 128 ) is_good_frame = false; } } diff --git a/sf-writer/src/ImageAssembler.cpp b/sf-writer/src/ImageAssembler.cpp index b16b285..9f440c7 100644 --- a/sf-writer/src/ImageAssembler.cpp +++ b/sf-writer/src/ImageAssembler.cpp @@ -136,7 +136,7 @@ ImageMetadataBlock* ImageAssembler::get_metadata_buffer(const uint64_t bunch_id) auto& frame_meta = frame_meta_buffer_[meta_offset]; auto is_good_frame = - frame_meta.n_received_packets == JF_N_PACKETS_PER_FRAME; + frame_meta.n_recv_packets == JF_N_PACKETS_PER_FRAME; if (!is_good_frame) { image_is_good_frame[i_pulse] = 0; @@ -166,7 +166,7 @@ ImageMetadataBlock* ImageAssembler::get_metadata_buffer(const uint64_t bunch_id) image_is_good_frame[i_pulse] = 0; } - if (frame_meta.n_received_packets != JF_N_PACKETS_PER_FRAME) { + if (frame_meta.n_recv_packets != JF_N_PACKETS_PER_FRAME) { image_is_good_frame[i_pulse] = 0; } } diff --git a/sf-writer/test/test_ImageAssembler.cpp b/sf-writer/test/test_ImageAssembler.cpp index fb98fba..af8162e 100644 --- a/sf-writer/test/test_ImageAssembler.cpp +++ b/sf-writer/test/test_ImageAssembler.cpp @@ -55,7 +55,7 @@ TEST(ImageAssembler, reconstruction) frame_meta.pulse_id = 100 + i_pulse; frame_meta.daq_rec = 1000 + i_pulse; frame_meta.frame_index = 10000 + i_pulse; - frame_meta.n_received_packets = JF_N_PACKETS_PER_FRAME; + frame_meta.n_recv_packets = JF_N_PACKETS_PER_FRAME; for (size_t i_pixel=0; i_pixel < MODULE_N_PIXELS; i_pixel++) { buffer_block->frame[i_pulse].data[i_pixel] =