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

Rename BufferUdpReceiver.cpp to FrameUdpReceiver.cpp

Browse Source
This commit is contained in:
babic_a
2020-06-04 10:58:28 +02:00
parent bbf604675e
commit 708698314f
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sf-buffer/include/BufferUdpReceiver.hpp → sf-buffer/include/FrameUdpReceiver.hpp
+6 -6
View File
@@ -1,12 +1,12 @@
#ifndef SF_DAQ_BUFFER_BUFFERUDPRECEIVER_HPP
#define SF_DAQ_BUFFER_BUFFERUDPRECEIVER_HPP
#ifndef SF_DAQ_BUFFER_FRAMEUDPRECEIVER_HPP
#define SF_DAQ_BUFFER_FRAMEUDPRECEIVER_HPP
#include <netinet/in.h>
#include "UdpReceiver.hpp"
#include "formats.hpp"
#include "buffer_config.hpp"
class BufferUdpReceiver {
class FrameUdpReceiver {
const int source_id_;
UdpReceiver udp_receiver_;
@@ -27,10 +27,10 @@ class BufferUdpReceiver {
const int n_packets, ModuleFrame& metadata, char* frame_buffer);
public:
BufferUdpReceiver(const uint16_t port, const int source_id);
virtual ~BufferUdpReceiver();
FrameUdpReceiver(const uint16_t port, const int source_id);
virtual ~FrameUdpReceiver();
uint64_t get_frame_from_udp(ModuleFrame& metadata, char* frame_buffer);
};
#endif //SF_DAQ_BUFFER_BUFFERUDPRECEIVER_HPP
#endif //SF_DAQ_BUFFER_FRAMEUDPRECEIVER_HPP
sf-buffer/src/BufferUdpReceiver.cpp → sf-buffer/src/FrameUdpReceiver.cpp
+7 -7
View File
@@ -1,11 +1,11 @@
#include <cstring>
#include <jungfrau.hpp>
#include "BufferUdpReceiver.hpp"
#include "FrameUdpReceiver.hpp"
using namespace std;
using namespace core_buffer;
BufferUdpReceiver::BufferUdpReceiver(
FrameUdpReceiver::FrameUdpReceiver(
const uint16_t port,
const int source_id) :
source_id_(source_id)
@@ -23,11 +23,11 @@ BufferUdpReceiver::BufferUdpReceiver(
}
}
BufferUdpReceiver::~BufferUdpReceiver() {
FrameUdpReceiver::~FrameUdpReceiver() {
udp_receiver_.disconnect();
}
inline void BufferUdpReceiver::init_frame(
inline void FrameUdpReceiver::init_frame(
ModuleFrame& frame_metadata, const int i_packet)
{
frame_metadata.pulse_id = packet_buffer_[i_packet].bunchid;
@@ -36,7 +36,7 @@ inline void BufferUdpReceiver::init_frame(
frame_metadata.module_id = (int64_t) source_id_;
}
inline void BufferUdpReceiver::copy_packet_to_buffers(
inline void FrameUdpReceiver::copy_packet_to_buffers(
ModuleFrame& metadata, char* frame_buffer, const int i_packet)
{
size_t frame_buffer_offset =
@@ -49,7 +49,7 @@ inline void BufferUdpReceiver::copy_packet_to_buffers(
metadata.n_recv_packets++;
}
inline uint64_t BufferUdpReceiver::process_packets(
inline uint64_t FrameUdpReceiver::process_packets(
const int start_offset,
ModuleFrame& metadata,
char* frame_buffer)
@@ -100,7 +100,7 @@ inline uint64_t BufferUdpReceiver::process_packets(
return 0;
}
uint64_t BufferUdpReceiver::get_frame_from_udp(
uint64_t FrameUdpReceiver::get_frame_from_udp(
ModuleFrame& metadata, char* frame_buffer)
{
// Reset the metadata and frame buffer for the next frame.
sf-buffer/src/main.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include "formats.hpp"
#include "buffer_config.hpp"
#include "jungfrau.hpp"
#include "BufferUdpReceiver.hpp"
#include "FrameUdpReceiver.hpp"
#include "BufferBinaryWriter.hpp"
using namespace std;
@@ -70,7 +70,7 @@ int main (int argc, char *argv[]) {
uint64_t n_corrupted_frames = 0;
BufferBinaryWriter writer(root_folder, device_name);
BufferUdpReceiver receiver(udp_port, source_id);
FrameUdpReceiver receiver(udp_port, source_id);
auto binary_buffer = new BufferBinaryFormat();
auto socket = get_live_stream_socket(detector_name, source_id);
sf-buffer/test/main.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "test_UdpReceiver.cpp"
#include "test_BufferBinaryWriter.cpp"
#include "test_BufferH5Writer.cpp"
#include "test_BufferUdpReceiver.cpp"
#include "test_FrameUdpReceiver.cpp"
using namespace std;
sf-buffer/test/test_BufferUdpReceiver.cpp → sf-buffer/test/test_FrameUdpReceiver.cpp
+5 -5
View File
@@ -1,7 +1,7 @@
#include <netinet/in.h>
#include <jungfrau.hpp>
#include "gtest/gtest.h"
#include "BufferUdpReceiver.hpp"
#include "FrameUdpReceiver.hpp"
#include "mock/udp.hpp"
#include <thread>
@@ -21,7 +21,7 @@ TEST(BufferUdpReceiver, simple_recv)
auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
ASSERT_TRUE(send_socket_fd >= 0);
BufferUdpReceiver udp_receiver(udp_port, source_id);
FrameUdpReceiver udp_receiver(udp_port, source_id);
auto handle = async(launch::async, [&](){
for (int i_frame=0; i_frame < n_frames; i_frame++){
@@ -74,7 +74,7 @@ TEST(BufferUdpReceiver, missing_middle_packet)
auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
ASSERT_TRUE(send_socket_fd >= 0);
BufferUdpReceiver udp_receiver(udp_port, source_id);
FrameUdpReceiver udp_receiver(udp_port, source_id);
auto handle = async(launch::async, [&](){
for (int i_frame=0; i_frame < n_frames; i_frame++){
@@ -132,7 +132,7 @@ TEST(BufferUdpReceiver, missing_first_packet)
auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
ASSERT_TRUE(send_socket_fd >= 0);
BufferUdpReceiver udp_receiver(udp_port, source_id);
FrameUdpReceiver udp_receiver(udp_port, source_id);
auto handle = async(launch::async, [&](){
for (int i_frame=0; i_frame < n_frames; i_frame++){
@@ -190,7 +190,7 @@ TEST(BufferUdpReceiver, missing_last_packet)
auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0);
ASSERT_TRUE(send_socket_fd >= 0);
BufferUdpReceiver udp_receiver(udp_port, source_id);
FrameUdpReceiver udp_receiver(udp_port, source_id);
auto handle = async(launch::async, [&](){
for (int i_frame=0; i_frame < n_frames; i_frame++){