sched: reduce static size of csi-measconfig

Author: frankist

include/srsran/ran/csi_rs/csi_meas_config.h

@@ -281,10 +281,10 @@ struct csi_aperiodic_trigger_state {
   bool operator!=(const csi_aperiodic_trigger_state& rhs) const { return !(rhs == *this); }
 };
 
-/// Used to configure the UE with a list of aperiodic trigger states. Each codepoint of the DCI field "CSI request" is
-/// associated with one trigger state.
+/// \brief Used to configure the UE with a list of aperiodic trigger states. Each codepoint of the DCI field
+/// "CSI request" is associated with one trigger state. List size ranges from 0 to MAX_NOF_CSI_APERIODIC_TRIGGERS.
 /// \remark TS 38.331, \c CSI-AperiodicTriggerStateList.
-using csi_aperiodic_trigger_state_list = static_vector<csi_aperiodic_trigger_state, MAX_NOF_CSI_APERIODIC_TRIGGERS>;
+using csi_aperiodic_trigger_state_list = std::vector<csi_aperiodic_trigger_state>;
 
 /// See TS 38.331, \c CSI-SemiPersistentOnPUSCH-TriggerState.
 struct csi_semi_persistent_on_pusch_trigger_state {
@@ -322,7 +322,7 @@ struct csi_meas_config {
   std::vector<csi_report_config> csi_report_cfg_list;
   /// Size of CSI request field in DCI (bits). See TS 38.214, clause 5.2.1.5.1.
   std::optional<unsigned>                                        report_trigger_size;
-  std::optional<csi_aperiodic_trigger_state_list>                aperiodic_trigger_state_list;
+  csi_aperiodic_trigger_state_list                               aperiodic_trigger_state_list;
   std::optional<csi_semi_persistent_on_pusch_trigger_state_list> semi_persistent_on_pusch_trigger_state_list;
 
   bool operator==(const csi_meas_config& rhs) const

lib/du/du_high/du_manager/converters/asn1_csi_meas_config_helpers.cpp

@@ -1273,15 +1273,15 @@ void srsran::srs_du::calculate_csi_meas_config_diff(asn1::rrc_nr::csi_meas_cfg_s
     out.report_trigger_size         = dest.report_trigger_size.value();
   }
 
-  if ((dest.aperiodic_trigger_state_list.has_value() and not src.aperiodic_trigger_state_list.has_value()) or
-      (dest.aperiodic_trigger_state_list.has_value() and src.aperiodic_trigger_state_list.has_value() and
+  if ((not dest.aperiodic_trigger_state_list.empty() and src.aperiodic_trigger_state_list.empty()) or
+      (not dest.aperiodic_trigger_state_list.empty() and not src.aperiodic_trigger_state_list.empty() and
        dest.aperiodic_trigger_state_list != src.aperiodic_trigger_state_list)) {
     out.aperiodic_trigger_state_list_present = true;
     auto& ap_trigger_state_list              = out.aperiodic_trigger_state_list.set_setup();
-    for (const auto& trigger_state : dest.aperiodic_trigger_state_list.value()) {
+    for (const auto& trigger_state : dest.aperiodic_trigger_state_list) {
       ap_trigger_state_list.push_back(make_asn1_aperiodic_trigger_state(trigger_state));
     }
-  } else if (src.aperiodic_trigger_state_list.has_value() and not dest.aperiodic_trigger_state_list.has_value()) {
+  } else if (not src.aperiodic_trigger_state_list.empty() and dest.aperiodic_trigger_state_list.empty()) {
     out.aperiodic_trigger_state_list_present = true;
     out.aperiodic_trigger_state_list.set_release();
   }

tests/unittests/du_manager/serving_cell_config_converter_test.cpp

@@ -1125,11 +1125,10 @@ TEST(serving_cell_config_converter_test, test_custom_csi_meas_cfg_conversion)
 
   dest_csi_meas_cfg.report_trigger_size = 2;
 
-  dest_csi_meas_cfg.aperiodic_trigger_state_list.emplace();
   auto associated_report_cfg_info_list =
       csi_associated_report_config_info{.report_cfg_id   = static_cast<csi_report_config_id_t>(1),
                                         .res_for_channel = csi_associated_report_config_info::csi_ssb_resource_set{1}};
-  dest_csi_meas_cfg.aperiodic_trigger_state_list.value().push_back(
+  dest_csi_meas_cfg.aperiodic_trigger_state_list.push_back(
       csi_aperiodic_trigger_state{.associated_report_cfg_info_list = {associated_report_cfg_info_list}});
 
   dest_csi_meas_cfg.semi_persistent_on_pusch_trigger_state_list.emplace();