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

Improve logic for loaded packet

Browse Source
This commit is contained in:
babic_a
2020-05-11 13:46:05 +02:00
parent e6387fe8bf
commit 5df92a976e
2 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/src/BufferUdpReceiver.cpp
+33 -26
View File
@@ -1,5 +1,9 @@
#include <cstring>
#include <jungfrau.hpp>
#include "BufferUdpReceiver.hpp"
#include <iostream>
using namespace std;
BufferUdpReceiver::BufferUdpReceiver(
const uint16_t port,
@@ -13,7 +17,7 @@ BufferUdpReceiver::~BufferUdpReceiver() {
udp_receiver_.disconnect();
}
inline void BufferUdpReceiver::init_frame (ModuleFrame& frame_metadata)
inline void BufferUdpReceiver::init_frame(ModuleFrame& frame_metadata)
{
frame_metadata.pulse_id = packet_buffer_.bunchid;
frame_metadata.frame_index = packet_buffer_.framenum;
@@ -21,7 +25,20 @@ inline void BufferUdpReceiver::init_frame (ModuleFrame& frame_metadata)
frame_metadata.module_id = (int64_t) source_id_;
}
void BufferUdpReceiver::get_frame_from_udp(
inline void BufferUdpReceiver::copy_packet_to_buffers(
ModuleFrame& metadata, char* frame_buffer)
{
size_t frame_buffer_offset =
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer_.packetnum;
memcpy(
(void*) (frame_buffer + frame_buffer_offset),
packet_buffer_.data,
JUNGFRAU_DATA_BYTES_PER_PACKET);
metadata.n_received_packets++;
}
uint64_t BufferUdpReceiver::get_frame_from_udp(
ModuleFrame& metadata, char* frame_buffer)
{
// Reset the metadata and frame buffer for the next frame.
@@ -29,18 +46,12 @@ void BufferUdpReceiver::get_frame_from_udp(
metadata.n_received_packets = 0;
memset(frame_buffer, 0, JUNGFRAU_DATA_BYTES_PER_FRAME);
// The buffer contains a valid packet. Use it.
if (packet_buffer_.bunchid != 0) {
// Happens when last packet from previous frame was missed.
if (packet_buffer_loaded_) {
packet_buffer_loaded_ = false;
init_frame(metadata);
size_t frame_buffer_offset =
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer_.packetnum;
memcpy(
(void*) (frame_buffer + frame_buffer_offset),
packet_buffer_.data,
JUNGFRAU_DATA_BYTES_PER_PACKET);
metadata.n_received_packets++;
copy_packet_to_buffers(metadata, frame_buffer);
}
while (true) {
@@ -55,26 +66,22 @@ void BufferUdpReceiver::get_frame_from_udp(
if (metadata.pulse_id == 0) {
init_frame(metadata);
// Happens if the last packet from the previous frame gets lost.
// Happens if the last packet from the previous frame gets lost.
} else if (metadata.pulse_id != packet_buffer_.bunchid) {
return;
cout << "source_id " << source_id_ << " missing last packet";
cout << " pulse_id " << metadata.pulse_id << endl;
packet_buffer_loaded_ = true;
return metadata.pulse_id;
}
size_t frame_buffer_offset =
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer_.packetnum;
memcpy(
(void*) (frame_buffer + frame_buffer_offset),
packet_buffer_.data,
JUNGFRAU_DATA_BYTES_PER_PACKET);
metadata.n_received_packets++;
copy_packet_to_buffers(metadata, frame_buffer);
// Last frame packet received. Frame finished.
if (packet_buffer_.packetnum == JUNGFRAU_N_PACKETS_PER_FRAME-1)
{
// Indicates that the packet has already been consumed.
packet_buffer_.bunchid = 0;
return;
return metadata.pulse_id;
}
}
}