First working version of BufferUdpReceiver

This commit is contained in:
2020-05-11 12:42:55 +02:00
parent 9b75a6d991
commit 9c99350442
2 changed files with 22 additions and 22 deletions
+18 -22
View File
@@ -1,3 +1,4 @@
#include <cstring>
#include "BufferUdpReceiver.hpp"
BufferUdpReceiver::BufferUdpReceiver(
@@ -12,36 +13,31 @@ BufferUdpReceiver::~BufferUdpReceiver() {
udp_receiver_.disconnect();
}
inline void BufferUdpReceiver::init_frame (
ModuleFrame& frame_metadata,
jungfrau_packet& packet_buffer,
uint64_t source_id)
inline void BufferUdpReceiver::init_frame (ModuleFrame& frame_metadata)
{
frame_metadata.pulse_id = packet_buffer.bunchid;
frame_metadata.frame_index = packet_buffer.framenum;
frame_metadata.daq_rec = (uint64_t)packet_buffer.debug;
frame_metadata.module_id = source_id;
frame_metadata.pulse_id = packet_buffer_.bunchid;
frame_metadata.frame_index = packet_buffer_.framenum;
frame_metadata.daq_rec = (uint64_t) packet_buffer_.debug;
frame_metadata.module_id = (int64_t) source_id_;
}
void BufferUdpReceiver::get_frame_from_udp(
ModuleFrame& metadata, char* frame_buffer)
{
static jungfrau_packet packet_buffer = {};
// Reset the metadata and frame buffer for the next frame.
metadata.pulse_id = 0;
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) {
init_frame(metadata, packet_buffer, source_id);
if (packet_buffer_.bunchid != 0) {
init_frame(metadata);
size_t frame_buffer_offset =
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer.packetnum;
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer_.packetnum;
memcpy(
(void*) (frame_buffer + frame_buffer_offset),
packet_buffer.data,
packet_buffer_.data,
JUNGFRAU_DATA_BYTES_PER_PACKET);
metadata.n_received_packets++;
@@ -49,35 +45,35 @@ void BufferUdpReceiver::get_frame_from_udp(
while (true) {
if (!udp_receiver.receive(
&packet_buffer,
if (!udp_receiver_.receive(
&packet_buffer_,
JUNGFRAU_BYTES_PER_PACKET)) {
continue;
}
// First packet for this frame.
if (metadata.pulse_id == 0) {
init_frame(metadata, packet_buffer, source_id);
init_frame(metadata);
// Happens if the last packet from the previous frame gets lost.
} else if (metadata.pulse_id != packet_buffer.bunchid) {
} else if (metadata.pulse_id != packet_buffer_.bunchid) {
return;
}
size_t frame_buffer_offset =
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer.packetnum;
JUNGFRAU_DATA_BYTES_PER_PACKET * packet_buffer_.packetnum;
memcpy(
(void*) (frame_buffer + frame_buffer_offset),
packet_buffer.data,
packet_buffer_.data,
JUNGFRAU_DATA_BYTES_PER_PACKET);
metadata.n_received_packets++;
// Last frame packet received. Frame finished.
if (packet_buffer.packetnum == JUNGFRAU_N_PACKETS_PER_FRAME-1)
if (packet_buffer_.packetnum == JUNGFRAU_N_PACKETS_PER_FRAME-1)
{
// Indicates that the packet has already been consumed.
packet_buffer.bunchid = 0;
packet_buffer_.bunchid = 0;
return;
}
}