new subfolder for udp message (de)fragmentation io/udp/fragmentation

new subfolder for higher level udp protobuf message handling io/udp/protobuf
eclipse-ecal · Dec 5, 2023 · 61455d5 · 61455d5
1 parent 71c79a8
commit 61455d5
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 43 deletions.
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
@@ -144,19 +144,25 @@ set(ecal_io_udp_src_npcap
 )
 endif()
 
+set(ecal_io_udp_fragmentation_src
+    src/io/udp/fragmentation/rcv_fragments.cpp
+    src/io/udp/fragmentation/rcv_fragments.h
+    src/io/udp/fragmentation/snd_fragments.cpp
+    src/io/udp/fragmentation/snd_fragments.h
+)
+
+set(ecal_io_udp_protobuf_src
+    src/io/udp/protobuf/rcv_logging.cpp
+    src/io/udp/protobuf/rcv_logging.h
+    src/io/udp/protobuf/rcv_sample.cpp
+    src/io/udp/protobuf/rcv_sample.h
+    src/io/udp/protobuf/snd_sample.cpp
+    src/io/udp/protobuf/snd_sample.h
+)
+
 set(ecal_io_udp_src
     src/io/udp/ecal_receiver.h
     src/io/udp/msg_type.h
-    src/io/udp/rcv_logging.cpp
-    src/io/udp/rcv_logging.h
-    src/io/udp/rcv_sample.cpp
-    src/io/udp/rcv_sample.h
-    src/io/udp/rcv_sample_slot.cpp
-    src/io/udp/rcv_sample_slot.h
-    src/io/udp/snd_raw_buffer.cpp
-    src/io/udp/snd_raw_buffer.h
-    src/io/udp/snd_sample.cpp
-    src/io/udp/snd_sample.h
     src/io/udp/topic2mcast.h
     src/io/udp/udp_configurations.cpp
     src/io/udp/udp_configurations.h
@@ -448,7 +454,9 @@ ecal_add_ecal_shared_library(${PROJECT_NAME}
     ${ecal_io_mtx_win_src}
     ${ecal_io_shm_src} 
     ${ecal_io_shm_linux_src}
-    ${ecal_io_shm_win_src} 
+    ${ecal_io_shm_win_src}
+    ${ecal_io_udp_fragmentation_src}
+    ${ecal_io_udp_protobuf_src}
     ${ecal_io_udp_src}
     ${ecal_io_udp_linux_src}
     ${ecal_logging_src} 
@@ -568,6 +576,8 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0")
     ${ecal_io_shm_src} 
     ${ecal_io_shm_linux_src}
     ${ecal_io_shm_win_src} 
+    ${ecal_io_udp_fragmentation_src}
+    ${ecal_io_udp_protobuf_src}
     ${ecal_io_udp_src}
     ${ecal_logging_src} 
     ${ecal_monitoring_src}

diff --git a/ecal/core/src/io/udp/rcv_sample_slot.cpp → ...rc/io/udp/fragmentation/rcv_fragments.cpp b/ecal/core/src/io/udp/rcv_sample_slot.cpp → ...rc/io/udp/fragmentation/rcv_fragments.cpp
@@ -21,13 +21,13 @@
  * @brief  UDP sample receiver to receive messages of type eCAL::pb::Sample
 **/
 
-#include "rcv_sample_slot.h"
+#include "rcv_fragments.h"
 
 #include <ecal/ecal_log.h>
 
 #include <cstring>
 
-CReceiveSlot::CReceiveSlot()
+CMsgDefragmentation::CMsgDefragmentation()
   : m_timeout(0.0)
   , m_recv_mode(rcm_waiting)
   , m_message_id(0)
@@ -38,9 +38,9 @@ CReceiveSlot::CReceiveSlot()
 {
 }
 
-CReceiveSlot::~CReceiveSlot() = default;
+CMsgDefragmentation::~CMsgDefragmentation() = default;
 
-int CReceiveSlot::ApplyMessage(const struct SUDPMessage& ecal_message_)
+int CMsgDefragmentation::ApplyMessage(const struct SUDPMessage& ecal_message_)
 {
   // reset timeout
   m_timeout = std::chrono::duration<double>(0.0);
@@ -71,7 +71,7 @@ int CReceiveSlot::ApplyMessage(const struct SUDPMessage& ecal_message_)
   return(0);
 }
 
-int CReceiveSlot::OnMessageStart(const struct SUDPMessage& ecal_message_)
+int CMsgDefragmentation::OnMessageStart(const struct SUDPMessage& ecal_message_)
 {
   // store header info
   m_message_id        = ecal_message_.header.id;
@@ -91,7 +91,7 @@ int CReceiveSlot::OnMessageStart(const struct SUDPMessage& ecal_message_)
   return(0);
 }
 
-int CReceiveSlot::OnMessageData(const struct SUDPMessage& ecal_message_)
+int CMsgDefragmentation::OnMessageData(const struct SUDPMessage& ecal_message_)
 {
   // check message id
   if(ecal_message_.header.id != m_message_id)

diff --git a/ecal/core/src/io/udp/rcv_sample_slot.h → .../src/io/udp/fragmentation/rcv_fragments.h b/ecal/core/src/io/udp/rcv_sample_slot.h → .../src/io/udp/fragmentation/rcv_fragments.h
@@ -24,16 +24,16 @@
 #pragma once
 
 #include "ecal_def.h"
-#include "msg_type.h"
+#include "io/udp/msg_type.h"
 
 #include <chrono>
 #include <vector>
 
-class CReceiveSlot
+class CMsgDefragmentation
 {
 public:
-  CReceiveSlot();
-  virtual ~CReceiveSlot();
+  CMsgDefragmentation();
+  virtual ~CMsgDefragmentation();
 
   int ApplyMessage(const struct SUDPMessage& ecal_message_);
 

diff --git a/ecal/core/src/io/udp/snd_raw_buffer.cpp → ...rc/io/udp/fragmentation/snd_fragments.cpp b/ecal/core/src/io/udp/snd_raw_buffer.cpp → ...rc/io/udp/fragmentation/snd_fragments.cpp
@@ -27,7 +27,7 @@
 
 #include "ecal_process.h"
 
-#include "snd_raw_buffer.h"
+#include "snd_fragments.h"
 #include "io/udp/msg_type.h"
 
 namespace
@@ -79,7 +79,7 @@ namespace eCAL
     return (0);
   }
 
-  size_t SendSampleBuffer(char* buf_, size_t buf_len_, long bandwidth_, TransmitCallbackT transmit_cb_)
+  size_t SendFragmentedMessage(char* buf_, size_t buf_len_, long bandwidth_, TransmitCallbackT transmit_cb_)
   {
     if (buf_ == nullptr) return(0);
 

diff --git a/ecal/core/src/io/udp/snd_raw_buffer.h → .../src/io/udp/fragmentation/snd_fragments.h b/ecal/core/src/io/udp/snd_raw_buffer.h → .../src/io/udp/fragmentation/snd_fragments.h
@@ -37,5 +37,5 @@ namespace eCAL
   size_t CreateSampleBuffer(const std::string& sample_name_, const eCAL::pb::Sample& ecal_sample_, std::vector<char>& payload_);
 
   using TransmitCallbackT = std::function<size_t (const void *, const size_t)>;
-  size_t SendSampleBuffer(char* buf_, size_t buf_len_, long bandwidth_, TransmitCallbackT transmit_cb_);
+  size_t SendFragmentedMessage(char* buf_, size_t buf_len_, long bandwidth_, TransmitCallbackT transmit_cb_);
 }
diff --git a/ecal/core/src/io/udp/rcv_logging.cpp → .../core/src/io/udp/protobuf/rcv_logging.cpp b/ecal/core/src/io/udp/rcv_logging.cpp → .../core/src/io/udp/protobuf/rcv_logging.cpp
@@ -62,7 +62,6 @@ namespace eCAL
     const size_t recv_len = m_udp_receiver.Receive(m_msg_buffer.data(), m_msg_buffer.size(), CMN_UDP_RECEIVE_THREAD_CYCLE_TIME_MS);
     if (recv_len > 0)
     {
-      m_log_message.Clear();
       if (m_log_message.ParseFromArray(m_msg_buffer.data(), static_cast<int>(recv_len)))
       {
         if (IsLocalHost(m_log_message) || m_network_mode)

diff --git a/ecal/core/src/io/udp/rcv_logging.h → ecal/core/src/io/udp/protobuf/rcv_logging.h b/ecal/core/src/io/udp/rcv_logging.h → ecal/core/src/io/udp/protobuf/rcv_logging.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "ecal_def.h"
-#include "udp_receiver.h"
+#include "io/udp/udp_receiver.h"
 #include "util/ecal_thread.h"
 
 #include <string>
@@ -56,7 +56,7 @@ namespace eCAL
     LogMessageCallbackT              m_log_message_callback;
 
     CUDPReceiver                     m_udp_receiver;
-    std::shared_ptr<CCallbackThread>  m_udp_receiver_thread;
+    std::shared_ptr<CCallbackThread> m_udp_receiver_thread;
 
     std::vector<char>                m_msg_buffer;
     eCAL::pb::LogMessage             m_log_message;

diff --git a/ecal/core/src/io/udp/rcv_sample.cpp → ecal/core/src/io/udp/protobuf/rcv_sample.cpp b/ecal/core/src/io/udp/rcv_sample.cpp → ecal/core/src/io/udp/protobuf/rcv_sample.cpp
diff --git a/ecal/core/src/io/udp/rcv_sample.h → ecal/core/src/io/udp/protobuf/rcv_sample.h b/ecal/core/src/io/udp/rcv_sample.h → ecal/core/src/io/udp/protobuf/rcv_sample.h
@@ -24,8 +24,8 @@
 #pragma once
 
 #include "ecal_def.h"
-#include "udp_receiver.h"
-#include "rcv_sample_slot.h"
+#include "io/udp/udp_receiver.h"
+#include "io/udp/fragmentation/rcv_fragments.h"
 #include "util/ecal_thread.h"
 
 #include <chrono>
@@ -45,7 +45,7 @@
 
 class CUDPSampleReceiver
 {
-  class CSampleReceiveSlot : public CReceiveSlot
+  class CSampleReceiveSlot : public CMsgDefragmentation
   {
   public:
     explicit CSampleReceiveSlot(CUDPSampleReceiver* sample_receiver_);

diff --git a/ecal/core/src/io/udp/snd_sample.cpp → ecal/core/src/io/udp/protobuf/snd_sample.cpp b/ecal/core/src/io/udp/snd_sample.cpp → ecal/core/src/io/udp/protobuf/snd_sample.cpp
@@ -18,13 +18,13 @@
 */
 
 /**
- * @brief  Sender thread for ecal samples
+ * @brief  UDP sample sender to send messages of type eCAL::pb::Sample
 **/
 
 #include <ecal/ecal.h>
 
 #include "snd_sample.h"
-#include "snd_raw_buffer.h"
+#include "io/udp/fragmentation/snd_fragments.h"
 
 namespace
 {
@@ -52,7 +52,7 @@ namespace eCAL
     if (data_size > 0)
     {
       // and send it
-      sent_sum = SendSampleBuffer(m_payload.data(), data_size, bandwidth_, std::bind(TransmitToUDP, std::placeholders::_1, std::placeholders::_2, m_udp_sender, m_attr.address));
+      sent_sum = SendFragmentedMessage(m_payload.data(), data_size, bandwidth_, std::bind(TransmitToUDP, std::placeholders::_1, std::placeholders::_2, m_udp_sender, m_attr.address));
 
 #ifndef NDEBUG
       // log it

diff --git a/ecal/core/src/io/udp/snd_sample.h → ecal/core/src/io/udp/protobuf/snd_sample.h b/ecal/core/src/io/udp/snd_sample.h → ecal/core/src/io/udp/protobuf/snd_sample.h
@@ -18,14 +18,14 @@
 */
 
 /**
- * @brief  Sender thread for ecal samples
+ * @brief  UDP sample sender to send messages of type eCAL::pb::Sample
 **/
 
 #pragma once
 
 #include <memory>
 
-#include "udp_sender.h"
+#include "io/udp/udp_sender.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 0) // disable proto warnings

diff --git a/ecal/core/src/logging/ecal_log_impl.h b/ecal/core/src/logging/ecal_log_impl.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include "io/udp/udp_sender.h"
-#include "io/udp/rcv_logging.h"
+#include "io/udp/protobuf/rcv_logging.h"
 
 #include <ecal/ecal.h>
 #include <ecal/ecal_os.h>

diff --git a/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h
@@ -25,7 +25,7 @@
 
 #include "readwrite/ecal_reader_layer.h"
 
-#include "io/udp/rcv_sample.h"
+#include "io/udp/protobuf/rcv_sample.h"
 
 #include <map>
 #include <memory>

diff --git a/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h
@@ -33,8 +33,7 @@
 #pragma warning(pop)
 #endif
 
-#include "io/udp/snd_sample.h"
-#include "io/udp/udp_sender.h"
+#include "io/udp/protobuf/snd_sample.h"
 #include "readwrite/ecal_writer_base.h"
 
 #include <string>

diff --git a/ecal/core/src/registration/ecal_registration_provider.cpp b/ecal/core/src/registration/ecal_registration_provider.cpp
@@ -34,7 +34,7 @@
 #include "ecal_descgate.h"
 
 #include "io/udp/udp_configurations.h"
-#include "io/udp/snd_sample.h"
+#include "io/udp/protobuf/snd_sample.h"
 
 #include <chrono>
 

diff --git a/ecal/core/src/registration/ecal_registration_provider.h b/ecal/core/src/registration/ecal_registration_provider.h
@@ -28,8 +28,7 @@
 
 #pragma once
 
-#include "io/udp/snd_sample.h"
-#include "io/udp/udp_sender.h"
+#include "io/udp/protobuf/snd_sample.h"
 
 #include "io/shm/ecal_memfile_broadcast.h"
 #include "io/shm/ecal_memfile_broadcast_writer.h"

diff --git a/ecal/core/src/registration/ecal_registration_receiver.h b/ecal/core/src/registration/ecal_registration_receiver.h
@@ -31,7 +31,7 @@
 
 #include "ecal_def.h"
 
-#include "io/udp/rcv_sample.h"
+#include "io/udp/protobuf/rcv_sample.h"
 
 #include "io/shm/ecal_memfile_broadcast.h"
 #include "io/shm/ecal_memfile_broadcast_reader.h"