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

Rename JF variable to shorter version

Browse Source
This commit is contained in:
babic_a
2020-05-25 15:10:15 +02:00
parent 05b62c30e6
commit 9d85d665c8
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/jungfrau.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#define JUNGFRAU_N_MODULES 32
#define JUNGFRAU_BYTES_PER_PACKET 8246
#define JUNGFRAU_DATA_BYTES_PER_PACKET 8192
#define JUNGFRAU_N_PACKETS_PER_FRAME 128
#define JF_N_PACKETS_PER_FRAME 128
#define JUNGFRAU_DATA_BYTES_PER_FRAME 1048576
#define JF_BYTES_PER_FRAME (8246 * 128)
sf-buffer/src/BufferUdpReceiver.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ inline uint64_t BufferUdpReceiver::process_packets(
// Last frame packet received. Frame finished.
if (packet_buffer_[i_packet].packetnum ==
JUNGFRAU_N_PACKETS_PER_FRAME-1)
JF_N_PACKETS_PER_FRAME - 1)
{
// Buffer is loaded only if this is not the last message.
if (i_packet+1 != packet_buffer_n_packets_) {
sf-buffer/src/main.cpp
+2 -2
View File
@@ -110,9 +110,9 @@ int main (int argc, char *argv[]) {
send_max_us = send_us_duration;
}
if (metadata.n_received_packets < JUNGFRAU_N_PACKETS_PER_FRAME) {
if (metadata.n_received_packets < JF_N_PACKETS_PER_FRAME) {
n_missed_packets +=
JUNGFRAU_N_PACKETS_PER_FRAME - metadata.n_received_packets;
JF_N_PACKETS_PER_FRAME - metadata.n_received_packets;
n_corrupted_frames++;
}
sf-buffer/test/test_BufferUdpReceiver.cpp
+4 -4
View File
@@ -12,7 +12,7 @@ using namespace std;
TEST(BufferUdpReceiver, simple_recv)
{
auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
auto n_packets = JF_N_PACKETS_PER_FRAME;
int source_id = 1234;
int n_frames = 5;
@@ -65,7 +65,7 @@ TEST(BufferUdpReceiver, simple_recv)
TEST(BufferUdpReceiver, missing_middle_packet)
{
auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
auto n_packets = JF_N_PACKETS_PER_FRAME;
int source_id = 1234;
int n_frames = 3;
@@ -123,7 +123,7 @@ TEST(BufferUdpReceiver, missing_middle_packet)
TEST(BufferUdpReceiver, missing_first_packet)
{
auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
auto n_packets = JF_N_PACKETS_PER_FRAME;
int source_id = 1234;
int n_frames = 3;
@@ -181,7 +181,7 @@ TEST(BufferUdpReceiver, missing_first_packet)
TEST(BufferUdpReceiver, missing_last_packet)
{
auto n_packets = JUNGFRAU_N_PACKETS_PER_FRAME;
auto n_packets = JF_N_PACKETS_PER_FRAME;
int source_id = 1234;
int n_frames = 3;
sf-buffer/test/test_UdpReceiver.cpp
+3 -3
View File
@@ -106,7 +106,7 @@ TEST(UdpReceiver, false_recv)
TEST(UdpReceiver, receive_many)
{
auto n_msg_buffer = JUNGFRAU_N_PACKETS_PER_FRAME;
auto n_msg_buffer = JF_N_PACKETS_PER_FRAME;
jungfrau_packet recv_buffer[n_msg_buffer];
iovec recv_buff_ptr[n_msg_buffer];
struct mmsghdr msgs[n_msg_buffer];
@@ -154,7 +154,7 @@ TEST(UdpReceiver, receive_many)
this_thread::sleep_for(chrono::milliseconds(10));
auto n_msgs = udp_receiver.receive_many(msgs, JUNGFRAU_N_PACKETS_PER_FRAME);
auto n_msgs = udp_receiver.receive_many(msgs, JF_N_PACKETS_PER_FRAME);
ASSERT_EQ(n_msgs, 2);
for (size_t i=0;i<n_msgs;i++) {
@@ -162,7 +162,7 @@ TEST(UdpReceiver, receive_many)
ASSERT_EQ(recv_buffer[i].bunchid, i);
}
n_msgs = udp_receiver.receive_many(msgs, JUNGFRAU_N_PACKETS_PER_FRAME);
n_msgs = udp_receiver.receive_many(msgs, JF_N_PACKETS_PER_FRAME);
ASSERT_EQ(n_msgs, -1);
udp_receiver.disconnect();