From 316de79afb0f0c3e27815d887b063a9e1e7a2089 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Tue, 9 Jun 2020 11:03:54 +0200 Subject: [PATCH] Rename PacketUdpReceiver --- sf-buffer/include/FrameUdpReceiver.hpp | 4 ++-- .../{UdpReceiver.hpp => PacketUdpReceiver.hpp} | 6 +++--- .../src/{UdpReceiver.cpp => PacketUdpReceiver.cpp} | 14 +++++++------- sf-buffer/test/main.cpp | 2 +- ..._UdpReceiver.cpp => test_PacketUdpReceiver.cpp} | 14 +++++++------- 5 files changed, 20 insertions(+), 20 deletions(-) rename sf-buffer/include/{UdpReceiver.hpp => PacketUdpReceiver.hpp} (79%) rename sf-buffer/src/{UdpReceiver.cpp => PacketUdpReceiver.cpp} (83%) rename sf-buffer/test/{test_UdpReceiver.cpp => test_PacketUdpReceiver.cpp} (94%) diff --git a/sf-buffer/include/FrameUdpReceiver.hpp b/sf-buffer/include/FrameUdpReceiver.hpp index 93a2146..6dece49 100644 --- a/sf-buffer/include/FrameUdpReceiver.hpp +++ b/sf-buffer/include/FrameUdpReceiver.hpp @@ -2,14 +2,14 @@ #define SF_DAQ_BUFFER_FRAMEUDPRECEIVER_HPP #include -#include "UdpReceiver.hpp" +#include "PacketUdpReceiver.hpp" #include "formats.hpp" #include "buffer_config.hpp" class FrameUdpReceiver { const int source_id_; - UdpReceiver udp_receiver_; + PacketUdpReceiver udp_receiver_; jungfrau_packet packet_buffer_[buffer_config::BUFFER_UDP_N_RECV_MSG]; iovec recv_buff_ptr_[buffer_config::BUFFER_UDP_N_RECV_MSG]; diff --git a/sf-buffer/include/UdpReceiver.hpp b/sf-buffer/include/PacketUdpReceiver.hpp similarity index 79% rename from sf-buffer/include/UdpReceiver.hpp rename to sf-buffer/include/PacketUdpReceiver.hpp index 0bea8ef..da92d85 100644 --- a/sf-buffer/include/UdpReceiver.hpp +++ b/sf-buffer/include/PacketUdpReceiver.hpp @@ -3,13 +3,13 @@ #include -class UdpReceiver { +class PacketUdpReceiver { int socket_fd_; public: - UdpReceiver(); - virtual ~UdpReceiver(); + PacketUdpReceiver(); + virtual ~PacketUdpReceiver(); bool receive(void* buffer, const size_t buffer_n_bytes); int receive_many(mmsghdr* msgs, const size_t n_msgs); diff --git a/sf-buffer/src/UdpReceiver.cpp b/sf-buffer/src/PacketUdpReceiver.cpp similarity index 83% rename from sf-buffer/src/UdpReceiver.cpp rename to sf-buffer/src/PacketUdpReceiver.cpp index fbe5e77..bbf5820 100644 --- a/sf-buffer/src/UdpReceiver.cpp +++ b/sf-buffer/src/PacketUdpReceiver.cpp @@ -1,6 +1,6 @@ #include #include -#include "UdpReceiver.hpp" +#include "PacketUdpReceiver.hpp" #include "jungfrau.hpp" #include #include @@ -9,17 +9,17 @@ using namespace std; using namespace buffer_config; -UdpReceiver::UdpReceiver() : +PacketUdpReceiver::PacketUdpReceiver() : socket_fd_(-1) { } -UdpReceiver::~UdpReceiver() +PacketUdpReceiver::~PacketUdpReceiver() { disconnect(); } -void UdpReceiver::bind(const uint16_t port) +void PacketUdpReceiver::bind(const uint16_t port) { if (socket_fd_ > -1) { throw runtime_error("Socket already bound."); @@ -62,12 +62,12 @@ void UdpReceiver::bind(const uint16_t port) } } -int UdpReceiver::receive_many(mmsghdr* msgs, const size_t n_msgs) +int PacketUdpReceiver::receive_many(mmsghdr* msgs, const size_t n_msgs) { return recvmmsg(socket_fd_, msgs, n_msgs, 0, 0); } -bool UdpReceiver::receive(void* buffer, const size_t buffer_n_bytes) +bool PacketUdpReceiver::receive(void* buffer, const size_t buffer_n_bytes) { auto data_len = recv(socket_fd_, buffer, buffer_n_bytes, 0); @@ -82,7 +82,7 @@ bool UdpReceiver::receive(void* buffer, const size_t buffer_n_bytes) return true; } -void UdpReceiver::disconnect() +void PacketUdpReceiver::disconnect() { close(socket_fd_); socket_fd_ = -1; diff --git a/sf-buffer/test/main.cpp b/sf-buffer/test/main.cpp index 580be0c..a49b74c 100644 --- a/sf-buffer/test/main.cpp +++ b/sf-buffer/test/main.cpp @@ -1,5 +1,5 @@ #include "gtest/gtest.h" -#include "test_UdpReceiver.cpp" +#include "test_PacketUdpReceiver.cpp" #include "test_BufferBinaryWriter.cpp" #include "test_BufferH5Writer.cpp" #include "test_FrameUdpReceiver.cpp" diff --git a/sf-buffer/test/test_UdpReceiver.cpp b/sf-buffer/test/test_PacketUdpReceiver.cpp similarity index 94% rename from sf-buffer/test/test_UdpReceiver.cpp rename to sf-buffer/test/test_PacketUdpReceiver.cpp index a7a6af0..1be343a 100644 --- a/sf-buffer/test/test_UdpReceiver.cpp +++ b/sf-buffer/test/test_PacketUdpReceiver.cpp @@ -2,21 +2,21 @@ #include #include "gtest/gtest.h" #include "mock/udp.hpp" -#include "UdpReceiver.hpp" +#include "PacketUdpReceiver.hpp" #include #include using namespace std; -TEST(UdpReceiver, simple_recv) +TEST(PacketUdpReceiver, simple_recv) { uint16_t udp_port = MOCK_UDP_PORT; auto send_socket_fd = socket(AF_INET,SOCK_DGRAM,0); ASSERT_TRUE(send_socket_fd >= 0); - UdpReceiver udp_receiver; + PacketUdpReceiver udp_receiver; udp_receiver.bind(udp_port); jungfrau_packet send_udp_buffer; @@ -52,14 +52,14 @@ TEST(UdpReceiver, simple_recv) ::close(send_socket_fd); } -TEST(UdpReceiver, false_recv) +TEST(PacketUdpReceiver, false_recv) { uint16_t udp_port = MOCK_UDP_PORT; auto send_socket_fd = socket(AF_INET,SOCK_DGRAM,0); ASSERT_TRUE(send_socket_fd >= 0); - UdpReceiver udp_receiver; + PacketUdpReceiver udp_receiver; udp_receiver.bind(udp_port); jungfrau_packet send_udp_buffer; @@ -104,7 +104,7 @@ TEST(UdpReceiver, false_recv) ::close(send_socket_fd); } -TEST(UdpReceiver, receive_many) +TEST(PacketUdpReceiver, receive_many) { auto n_msg_buffer = JF_N_PACKETS_PER_FRAME; jungfrau_packet recv_buffer[n_msg_buffer]; @@ -127,7 +127,7 @@ TEST(UdpReceiver, receive_many) auto send_socket_fd = socket(AF_INET,SOCK_DGRAM,0); ASSERT_TRUE(send_socket_fd >= 0); - UdpReceiver udp_receiver; + PacketUdpReceiver udp_receiver; udp_receiver.bind(udp_port); jungfrau_packet send_udp_buffer;