phy: use variant in upper PHY for PUSCH and PUCCH PDUs

Author: xavierarteaga

include/srsran/phy/upper/uplink_slot_pdu_repository.h

@@ -10,25 +10,15 @@
 
 #pragma once
 
+#include "srsran/adt/variant.h"
 #include "srsran/phy/upper/uplink_processor.h"
 #include "srsran/ran/slot_pdu_capacity_constants.h"
 #include <vector>
 
 namespace srsran {
 
 /// Defines an entry of the uplink slot PDU repository.
-struct uplink_slot_pdu_entry {
-  /// Labels for the supported PDU types.
-  enum class pdu_type { PUSCH, PUCCH };
-
-  /// PDU type.
-  pdu_type type;
-  // :TODO: convert this to variant.
-  /// PUSCH PDU.
-  uplink_processor::pusch_pdu pusch;
-  /// PUCCH PDU.
-  uplink_processor::pucch_pdu pucch;
-};
+using uplink_slot_pdu_entry = variant<uplink_processor::pusch_pdu, uplink_processor::pucch_pdu>;
 
 /// \brief Uplink slot PDU repository.
 ///
@@ -47,23 +37,13 @@ class uplink_slot_pdu_repository
   /// Adds the given PUSCH PDU to the repository at the given slot.
   void add_pusch_pdu(slot_point slot, const uplink_processor::pusch_pdu& pdu)
   {
-    uplink_slot_pdu_entry entry;
-    entry.type  = uplink_slot_pdu_entry::pdu_type::PUSCH;
-    entry.pusch = pdu;
-    entry.pucch = {};
-
-    repository[slot.to_uint() % nof_slots].push_back(entry);
+    repository[slot.to_uint() % nof_slots].push_back(pdu);
   }
 
   /// Adds the given PUCCH PDU to the repository at the given slot.
   void add_pucch_pdu(slot_point slot, const uplink_processor::pucch_pdu& pdu)
   {
-    uplink_slot_pdu_entry entry;
-    entry.type  = uplink_slot_pdu_entry::pdu_type::PUCCH;
-    entry.pucch = pdu;
-    entry.pusch = {};
-
-    repository[slot.to_uint() % nof_slots].push_back(entry);
+    repository[slot.to_uint() % nof_slots].push_back(pdu);
   }
 
   /// Clears the given slot of the registry.

lib/phy/upper/upper_phy_rx_symbol_handler_impl.cpp

@@ -66,9 +66,14 @@ void upper_phy_rx_symbol_handler_impl::handle_rx_symbol(const upper_phy_rx_symbo
   }
 
   const uplink_slot_pdu_entry& first_entry = pdus.front();
-  unsigned                     nof_symbols =
-      get_nsymb_per_slot((first_entry.type == uplink_slot_pdu_entry::pdu_type::PUSCH) ? first_entry.pusch.pdu.cp
-                                                                                      : get_cp(first_entry.pucch));
+  unsigned                     nof_symbols = 0;
+  if (variant_holds_alternative<uplink_processor::pusch_pdu>(first_entry)) {
+    const uplink_processor::pusch_pdu& pdu = variant_get<uplink_processor::pusch_pdu>(first_entry);
+    nof_symbols                            = get_nsymb_per_slot(pdu.pdu.cp);
+  } else {
+    const uplink_processor::pucch_pdu& pdu = variant_get<uplink_processor::pucch_pdu>(first_entry);
+    nof_symbols                            = get_nsymb_per_slot(get_cp(pdu));
+  }
   unsigned last_symbol_id = nof_symbols - 1U;
 
   // Process the PDUs when all symbols of the slot have been received.
@@ -81,13 +86,12 @@ void upper_phy_rx_symbol_handler_impl::handle_rx_symbol(const upper_phy_rx_symbo
 
   // Process all the PDUs from the pool.
   for (const auto& pdu : pdus) {
-    switch (pdu.type) {
-      case uplink_slot_pdu_entry::pdu_type::PUSCH:
-        process_pusch(pdu.pusch, ul_processor, grid, context.slot);
-        break;
-      case uplink_slot_pdu_entry::pdu_type::PUCCH:
-        ul_processor.process_pucch(rx_results_notifier, grid, pdu.pucch);
-        break;
+    if (variant_holds_alternative<uplink_processor::pusch_pdu>(pdu)) {
+      const uplink_processor::pusch_pdu& pusch_pdu = variant_get<uplink_processor::pusch_pdu>(pdu);
+      process_pusch(pusch_pdu, ul_processor, grid, context.slot);
+    } else if (variant_holds_alternative<uplink_processor::pucch_pdu>(pdu)) {
+      const uplink_processor::pucch_pdu& pucch_pdu = variant_get<uplink_processor::pucch_pdu>(pdu);
+      ul_processor.process_pucch(rx_results_notifier, grid, pucch_pdu);
     }
   }
 }