OFH: Optimize deserializer span read

Author: faluco

lib/ofh/ethernet/vlan_ethernet_frame_builder_impl.cpp

@@ -25,10 +25,10 @@ void vlan_frame_builder_impl::build_vlan_frame(span<uint8_t> buffer, const vlan_
   ofh::network_order_binary_serializer serializer(buffer.data());
 
   // Write destination MAC address (6 Bytes).
-  serializer.write(span<const uint8_t>(eth_params.mac_dst_address));
+  serializer.write(eth_params.mac_dst_address);
 
   // Write source MAC address (6 Bytes).
-  serializer.write(span<const uint8_t>(eth_params.mac_src_address));
+  serializer.write(eth_params.mac_src_address);
 
   // Write VLAN TPID (2 Bytes).
   serializer.write(VLAN_TPID);

lib/ofh/ethernet/vlan_ethernet_frame_decoder_impl.cpp

@@ -30,8 +30,8 @@ span<const uint8_t> vlan_frame_decoder_impl::decode(span<const uint8_t> frame, v
 
   ofh::network_order_binary_deserializer deserializer(frame);
 
-  deserializer.read(span<uint8_t>(eth_params.mac_dst_address));
-  deserializer.read(span<uint8_t>(eth_params.mac_src_address));
+  deserializer.read(eth_params.mac_dst_address);
+  deserializer.read(eth_params.mac_src_address);
 
   // VLAN parameters are stripped by the NIC.
 

lib/ofh/serdes/ofh_uplane_message_decoder_impl.cpp

@@ -217,7 +217,7 @@ static bool decode_prbs_no_ud_comp_param_field(span<compressed_prb>
     // No need to read the udCompParam field.
     prb.set_compression_param(0);
 
-    deserializer.read<uint8_t>(prb.get_byte_buffer().first(nof_bytes));
+    deserializer.read(prb.get_byte_buffer().first(nof_bytes));
     prb.set_stored_size(nof_bytes);
   }
 
@@ -254,7 +254,7 @@ static bool decode_prbs_with_ud_comp_param_field(span<compressed_prb>
   for (auto& prb : comp_prb) {
     prb.set_compression_param(deserializer.read<uint8_t>());
 
-    deserializer.read<uint8_t>(prb.get_byte_buffer().first(nof_bytes));
+    deserializer.read(prb.get_byte_buffer().first(nof_bytes));
     prb.set_stored_size(nof_bytes);
   }
 

lib/ofh/support/network_order_binary_deserializer.h

@@ -51,13 +51,21 @@ class network_order_binary_deserializer
   /// Deserializes a fixed amount of elements given by the size of the input span and advances the position by sizeof(T)
   /// bytes for each element.
   template <typename T>
-  void read(span<T> data)
+  void read(span<T> s)
   {
-    for (auto& element : data) {
+    for (auto& element : s) {
       element = read<T>();
     }
   }
 
+  /// Deserializes a fixed amount of bytes given by the size of the input span and advances the position by the span
+  /// size.
+  void read(span<uint8_t> s)
+  {
+    std::memcpy(s.data(), ptr, s.size() * sizeof(uint8_t));
+    advance(s.size() * sizeof(uint8_t));
+  }
+
   /// Advances the offset by the given amount.
   void advance(unsigned x)
   {

lib/ofh/support/network_order_binary_serializer.h

@@ -65,8 +65,8 @@ class network_order_binary_serializer
   /// Serializes the given span of bytes and advances the position by the span size.
   void write(span<const uint8_t> s)
   {
-    std::memcpy(ptr, s.data(), s.size());
-    advance(s.size());
+    std::memcpy(ptr, s.data(), s.size() * sizeof(uint8_t));
+    advance(s.size() * sizeof(uint8_t));
   }
 
   /// Serializes the given span of bytes and advances the position by the span size.