phy: fix PUSCH data buffer pool

Author: xavierarteaga

include/srsran/phy/upper/uplink_processor.h

@@ -40,8 +40,8 @@ class uplink_processor
   struct pusch_pdu {
     /// HARQ process number.
     unsigned harq_id;
-    /// Transport block size in bytes.
-    unsigned tb_size;
+    /// Transport block size.
+    units::bytes tb_size;
     /// PUSCH processor PDU.
     pusch_processor::pdu_t pdu;
   };

lib/fapi_adaptor/phy/messages/pusch.cpp

@@ -26,7 +26,7 @@ static void fill_codeword(uplink_processor::pusch_pdu& pdu, const fapi::ul_pusch
   cw.new_data        = fapi_pdu.pusch_data.new_data;
 
   pdu.harq_id = fapi_pdu.pusch_data.harq_process_id;
-  pdu.tb_size = fapi_pdu.pusch_data.tb_size.value();
+  pdu.tb_size = fapi_pdu.pusch_data.tb_size;
 
   pdu.pdu.codeword = optional<pusch_processor::codeword_description>(std::move(cw));
 }

lib/phy/upper/upper_phy_rx_symbol_handler_impl.h

@@ -27,21 +27,24 @@ class upper_phy_rx_results_notifier;
 class rx_payload_buffer_pool
 {
   /// Maximum number of payloads contained by the pool.
-  static const size_t MAX_NUM_PAYLOAD = 4096U;
-  static const size_t MAX_BUFFER_SIZE = MAX_RB * 156 * 8;
+  static constexpr size_t      MAX_NUM_PAYLOAD = 4096U;
+  static constexpr units::bits MAX_BUFFER_SIZE = units::bits(MAX_RB * 156 * 8);
 
 public:
   /// Returns the next available buffer from the pool.
-  span<uint8_t> acquire_payload_buffer(size_t size)
+  span<uint8_t> acquire_payload_buffer(units::bytes size)
   {
-    srsran_assert(size <= MAX_BUFFER_SIZE, "Buffer size (i.e., {}) exceeds maximum {}.", size, pool[index].size());
+    srsran_assert(size.to_bits() <= static_cast<units::bits>(MAX_BUFFER_SIZE),
+                  "Buffer size (i.e., {}) exceeds maximum {}.",
+                  size,
+                  pool[index].size());
     unsigned i = index++ % MAX_NUM_PAYLOAD;
-    return span<uint8_t>(pool[i]).first(size);
+    return span<uint8_t>(pool[i]).first(size.value());
   }
 
 private:
   /// Buffer pool.
-  circular_array<std::array<uint8_t, MAX_BUFFER_SIZE>, MAX_NUM_PAYLOAD> pool;
+  circular_array<std::array<uint8_t, MAX_BUFFER_SIZE.truncate_to_bytes().value()>, MAX_NUM_PAYLOAD> pool;
   /// Index used to retrieve the next container.
   unsigned index = 0;
 };

tests/unittests/fapi_adaptor/phy/messages/ul_pusch_pdu_test.cpp

@@ -86,6 +86,6 @@ TEST(fapi_phy_ul_pusch_adaptor_test, valid_pdu_pass)
   ASSERT_EQ(fapi_pdu.pusch_data.rv_index, phy_pdu.codeword.value().rv);
   ASSERT_EQ(fapi_pdu.pusch_data.new_data, phy_pdu.codeword.value().new_data);
   ASSERT_EQ(fapi_pdu.pusch_maintenance_v3.ldpc_base_graph, phy_pdu.codeword.value().ldpc_base_graph);
-  ASSERT_EQ(fapi_pdu.pusch_data.tb_size.value(), pdu.tb_size);
+  ASSERT_EQ(fapi_pdu.pusch_data.tb_size.value(), pdu.tb_size.value());
   ASSERT_EQ(fapi_pdu.pusch_data.harq_process_id, pdu.harq_id);
 }