treewide: switch uses of inhouse optional implementation for std::optional

Author: faluco

apps/gnb/adapters/e2ap_adapter.h

@@ -66,7 +66,7 @@ class e2ap_network_adapter : public e2_message_notifier,
   ///
   /// In case the gateway was configured to listen on port 0, i.e. the operating system shall pick a random free port,
   /// this function can be used to get the actual port number.
-  optional<uint16_t> get_listen_port()
+  std::optional<uint16_t> get_listen_port()
   {
     if (gateway == nullptr) {
       return {};

apps/gnb/gnb_appconfig.h

@@ -104,7 +104,7 @@ struct buffer_pool_appconfig {
 /// CPU affinities configuration for the gNB app.
 struct cpu_affinities_appconfig {
   /// CPUs isolation.
-  optional<os_sched_affinity_bitmask> isolated_cpus;
+  std::optional<os_sched_affinity_bitmask> isolated_cpus;
   /// Low priority workers CPU affinity mask.
   os_sched_affinity_config low_priority_cpu_cfg = {sched_affinity_mask_types::low_priority,
                                                    {},
@@ -156,7 +156,7 @@ struct gnb_appconfig {
   /// Expert configuration.
   expert_execution_appconfig expert_execution_cfg;
   /// HAL configuration.
-  optional<hal_appconfig> hal_config;
+  std::optional<hal_appconfig> hal_config;
 };
 
 } // namespace srsran

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -164,7 +164,7 @@ static void configure_cli11_buffer_pool_args(CLI::App& app, buffer_pool_appconfi
       ->capture_default_str();
 }
 
-static void configure_cli11_hal_args(CLI::App& app, optional<hal_appconfig>& config)
+static void configure_cli11_hal_args(CLI::App& app, std::optional<hal_appconfig>& config)
 {
   config.emplace();
 
@@ -270,9 +270,9 @@ static void configure_cli11_non_rt_threads_args(CLI::App& app, non_rt_threads_ap
 
 static void configure_cli11_cpu_affinities_args(CLI::App& app, cpu_affinities_appconfig& config)
 {
-  auto parsing_isolated_cpus_fcn = [](optional<os_sched_affinity_bitmask>& isolated_cpu_cfg,
-                                      const std::string&                   value,
-                                      const std::string&                   property_name) {
+  auto parsing_isolated_cpus_fcn = [](std::optional<os_sched_affinity_bitmask>& isolated_cpu_cfg,
+                                      const std::string&                        value,
+                                      const std::string&                        property_name) {
     isolated_cpu_cfg.emplace();
     parse_affinity_mask(*isolated_cpu_cfg, value, property_name);
 

apps/gnb/gnb_appconfig_translators.cpp

@@ -641,7 +641,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const du_high_unit_c
     const unsigned nof_crbs = band_helper::get_n_rbs_from_bw(
         base_cell.channel_bw_mhz, param.scs_common, band_helper::get_freq_range(*param.band));
 
-    optional<band_helper::ssb_coreset0_freq_location> ssb_freq_loc;
+    std::optional<band_helper::ssb_coreset0_freq_location> ssb_freq_loc;
     if (base_cell.pdcch_cfg.common.coreset0_index.has_value()) {
       ssb_freq_loc =
           band_helper::get_ssb_coreset0_freq_location_for_cset0_idx(base_cell.dl_arfcn,
@@ -882,12 +882,13 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const du_high_unit_c
     // PDSCH-Config - Update PDSCH time domain resource allocations based on partial slot and/or dedicated PDCCH
     // configuration.
     out_cell.dl_cfg_common.init_dl_bwp.pdsch_common.pdsch_td_alloc_list =
-        config_helpers::make_pdsch_time_domain_resource(
-            param.search_space0_index,
-            out_cell.dl_cfg_common.init_dl_bwp.pdcch_common,
-            out_cell.ue_ded_serv_cell_cfg.init_dl_bwp.pdcch_cfg,
-            band_helper::get_duplex_mode(param.band.value()) == duplex_mode::TDD ? out_cell.tdd_ul_dl_cfg_common.value()
-                                                                                 : optional<tdd_ul_dl_config_common>{});
+        config_helpers::make_pdsch_time_domain_resource(param.search_space0_index,
+                                                        out_cell.dl_cfg_common.init_dl_bwp.pdcch_common,
+                                                        out_cell.ue_ded_serv_cell_cfg.init_dl_bwp.pdcch_cfg,
+                                                        band_helper::get_duplex_mode(param.band.value()) ==
+                                                                duplex_mode::TDD
+                                                            ? out_cell.tdd_ul_dl_cfg_common.value()
+                                                            : std::optional<tdd_ul_dl_config_common>{});
 
     out_cell.ue_ded_serv_cell_cfg.pdsch_serv_cell_cfg->nof_harq_proc =
         (pdsch_serving_cell_config::nof_harq_proc_for_pdsch)config.cells_cfg.front().cell.pdsch_cfg.nof_harqs;
@@ -987,11 +988,12 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const du_high_unit_c
                                                         base_cell.pucch_cfg.sr_period_msec);
 
     // If any dependent parameter needs to be updated, this is the place.
-    config_helpers::compute_nof_sr_csi_pucch_res(
-        du_pucch_cfg,
-        base_cell.ul_common_cfg.max_pucchs_per_slot,
-        base_cell.pucch_cfg.sr_period_msec,
-        base_cell.csi_cfg.csi_rs_enabled ? optional<unsigned>{base_cell.csi_cfg.csi_rs_period_msec} : nullopt);
+    config_helpers::compute_nof_sr_csi_pucch_res(du_pucch_cfg,
+                                                 base_cell.ul_common_cfg.max_pucchs_per_slot,
+                                                 base_cell.pucch_cfg.sr_period_msec,
+                                                 base_cell.csi_cfg.csi_rs_enabled
+                                                     ? std::optional<unsigned>{base_cell.csi_cfg.csi_rs_period_msec}
+                                                     : std::nullopt);
     if (update_msg1_frequency_start) {
       rach_cfg.rach_cfg_generic.msg1_frequency_start = config_helpers::compute_prach_frequency_start(
           du_pucch_cfg, out_cell.ul_cfg_common.init_ul_bwp.generic_params.crbs.length(), is_long_prach);

apps/gnb/gnb_appconfig_validators.cpp

@@ -27,7 +27,7 @@ static bool validate_log_appconfig(const log_appconfig& config)
   return true;
 }
 
-static bool validate_hal_config(const optional<hal_appconfig>& config)
+static bool validate_hal_config(const std::optional<hal_appconfig>& config)
 {
 #ifdef DPDK_FOUND
   if (config && config->eal_args.empty()) {

apps/services/console_helper.h

@@ -72,7 +72,7 @@ class console_helper : public app_state_notifier
   metrics_plotter_stdout            metrics_plotter;
   metrics_plotter_json              metrics_json;
   std::vector<du_cell_config>       cells;
-  optional<ru_controller*>          radio_controller;
+  std::optional<ru_controller*>     radio_controller;
   srs_cu_cp::cu_cp_command_handler& cu_cp;
   bool                              autostart_stdout_metrics = false;
 

apps/services/worker_manager.cpp

@@ -119,7 +119,7 @@ void worker_manager::create_prio_worker(const std::string&
   using namespace execution_config_helper;
 
   const single_worker worker_desc{
-      name, {concurrent_queue_policy::locking_mpsc, queue_size}, execs, nullopt, prio, mask};
+      name, {concurrent_queue_policy::locking_mpsc, queue_size}, execs, std::nullopt, prio, mask};
   if (not exec_mng.add_execution_context(create_execution_context(worker_desc))) {
     report_fatal_error("Failed to instantiate {} execution context", worker_desc.name);
   }
@@ -237,7 +237,7 @@ void worker_manager::create_du_executors(bool                      is_blocking_m
 
     slot_workers[cell_id].executors.emplace_back("cell_exec#" + cell_id_str, task_priority::max - 1);
     slot_workers[cell_id].executors.push_back(
-        {"slot_exec#" + cell_id_str, task_priority::max, {}, nullopt, is_blocking_mode_active});
+        {"slot_exec#" + cell_id_str, task_priority::max, {}, std::nullopt, is_blocking_mode_active});
 
     if (not exec_mng.add_execution_context(create_execution_context(slot_workers[cell_id]))) {
       report_fatal_error("Failed to instantiate {} execution context", slot_workers[cell_id].name);

apps/units/cu_cp/cu_cp_unit_config.h

@@ -23,14 +23,14 @@ namespace srsran {
 
 /// Report configuration, for now only supporting the A3 event.
 struct cu_cp_unit_report_config {
-  unsigned           report_cfg_id;
-  std::string        report_type;
-  optional<unsigned> report_interval_ms;
-  std::string        a3_report_type;
+  unsigned                report_cfg_id;
+  std::string             report_type;
+  std::optional<unsigned> report_interval_ms;
+  std::string             a3_report_type;
   /// [-30..30] Note the actual value is field value * 0.5 dB. E.g. putting a value of -6 here results in -3dB offset.
-  optional<int>      a3_offset_db;
-  optional<unsigned> a3_hysteresis_db;
-  optional<unsigned> a3_time_to_trigger_ms;
+  std::optional<int>      a3_offset_db;
+  std::optional<unsigned> a3_hysteresis_db;
+  std::optional<unsigned> a3_time_to_trigger_ms;
 };
 
 struct cu_cp_unit_neighbor_cell_config_item {
@@ -43,26 +43,26 @@ struct cu_cp_unit_neighbor_cell_config_item {
 /// Each item describes the relationship between one cell to all other cells.
 struct cu_cp_unit_cell_config_item {
   /// Cell id.
-  uint64_t           nr_cell_id;
-  optional<unsigned> periodic_report_cfg_id;
+  uint64_t                nr_cell_id;
+  std::optional<unsigned> periodic_report_cfg_id;
 
   // These parameters must only be set for external cells
   /// gNodeB identifier bit length.
-  optional<unsigned> gnb_id_bit_length;
+  std::optional<unsigned> gnb_id_bit_length;
   /// PCI.
-  optional<pci_t> pci;
+  std::optional<pci_t> pci;
   /// NR band.
-  optional<nr_band> band;
+  std::optional<nr_band> band;
   /// SSB ARFCN.
-  optional<unsigned> ssb_arfcn;
+  std::optional<unsigned> ssb_arfcn;
   /// SSB subcarrier spacing.
-  optional<unsigned> ssb_scs;
+  std::optional<unsigned> ssb_scs;
   /// SSB period.
-  optional<unsigned> ssb_period;
+  std::optional<unsigned> ssb_period;
   /// SSB offset.
-  optional<unsigned> ssb_offset;
+  std::optional<unsigned> ssb_offset;
   /// SSB duration.
-  optional<unsigned> ssb_duration;
+  std::optional<unsigned> ssb_duration;
   /// Vector of cells that are a neighbor of this cell.
   std::vector<cu_cp_unit_neighbor_cell_config_item> ncells;
   // TODO: Add optional SSB parameters.

apps/units/flexible_du/du_high/du_high_config.h

@@ -65,7 +65,7 @@ struct du_high_unit_ssb_config {
 /// Common uplink parameters of a cell.
 struct du_high_unit_ul_common_config {
   /// Maximum transmit power allowed in this serving cell. Values: {-30,...,33}dBm.
-  optional<int> p_max;
+  std::optional<int> p_max;
   /// Maximum number of PUCCH grants per slot.
   unsigned max_pucchs_per_slot = 31U;
   /// Maximum number of PUSCH + PUCCH grants per slot.
@@ -236,7 +236,7 @@ struct du_high_unit_pucch_config {
   unsigned f2_max_nof_rbs = 1;
   /// \brief Maximum payload in bits that can be carried by PUCCH Format 2. Values {-1,...,11}.
   /// Value -1 to unset. If this is set, \ref f2_max_nof_rbs is ignored.
-  optional<unsigned> max_payload_bits;
+  std::optional<unsigned> max_payload_bits;
   /// Set true for PUCCH Format 2 intra-slot frequency hopping. This field is ignored if f2_nof_symbols == 1.
   bool f2_intraslot_freq_hopping = false;
   /// Max code rate.
@@ -254,7 +254,7 @@ struct du_high_unit_pucch_config {
 struct du_high_unit_phy_cell_group_config {
   /// \brief \c p-NR-FR1, part of \c PhysicalCellGroupConfig, TS 38.331. Values: {-30,...,33}.
   /// The maximum total TX power to be used by the UE in this NR cell group across all serving cells in FR1.
-  optional<int> p_nr_fr1;
+  std::optional<int> p_nr_fr1;
 };
 
 /// TDD pattern configuration. See TS 38.331, \c TDD-UL-DL-Pattern.
@@ -273,8 +273,8 @@ struct tdd_ul_dl_pattern_unit_config {
 
 /// TDD configuration. See TS 38.331, \c TDD-UL-DL-ConfigCommon.
 struct du_high_unit_tdd_ul_dl_config {
-  tdd_ul_dl_pattern_unit_config           pattern1;
-  optional<tdd_ul_dl_pattern_unit_config> pattern2;
+  tdd_ul_dl_pattern_unit_config                pattern1;
+  std::optional<tdd_ul_dl_pattern_unit_config> pattern2;
 };
 
 /// Paging related configuration. See TS 38.331, PCCH-Config.
@@ -294,24 +294,24 @@ struct du_high_unit_paging_config {
 /// PDCCH Common configuration.
 struct pdcch_common_unit_config {
   /// CORESET#0 index as per tables in TS 38.213, clause 13.
-  optional<unsigned> coreset0_index;
+  std::optional<unsigned> coreset0_index;
   /// Number of PDCCH candidates per aggregation level for SearchSpace#1. The aggregation level for the array element
   /// with index "x" is L=1U << x. The possible values for each element are {0, 1, 2, 3, 4, 5, 6, 8}.
   std::array<uint8_t, 5> ss1_n_candidates = {0, 0, 1, 0, 0};
   /// SearchSpace#0 index as per tables in TS 38.213, clause 13.
   unsigned ss0_index = 0;
   /// Maximum CORESET#0 duration in OFDM symbols to consider when deriving CORESET#0 index.
-  optional<uint8_t> max_coreset0_duration;
+  std::optional<uint8_t> max_coreset0_duration;
 };
 
 /// PDCCH Dedicated configuration.
 struct pdcch_dedicated_unit_config {
   /// Starting Common Resource Block (CRB) number for CORESET 1 relative to CRB 0.
-  optional<unsigned> coreset1_rb_start;
+  std::optional<unsigned> coreset1_rb_start;
   /// Length of CORESET 1 in number of CRBs.
-  optional<unsigned> coreset1_l_crb;
+  std::optional<unsigned> coreset1_l_crb;
   /// Duration of CORESET 1 in number of OFDM symbols.
-  optional<unsigned> coreset1_duration;
+  std::optional<unsigned> coreset1_duration;
   /// Number of PDCCH candidates per aggregation level for SearchSpace#2. The aggregation level for the array element
   /// with index "x" is L=1U << x. The possible values for each element are {0, 1, 2, 3, 4, 5, 6, 8}.
   /// NOTE: A value of {0, 0, 0, 0, 0} lets the gNB decide nof. candidates for SearchSpace#2.
@@ -382,13 +382,13 @@ struct du_high_unit_csi_config {
   unsigned csi_rs_period_msec = 20;
   /// \brief Slot offset for measurement CSI-RS resources. If not set, it is automatically derived to avoid collisions
   /// with SSB and SIB1.
-  optional<unsigned> meas_csi_slot_offset;
+  std::optional<unsigned> meas_csi_slot_offset;
   /// \brief Slot offset of the first CSI-RS resource used for tracking. If not set, it is automatically derived to
   /// avoid collisions with SSB and SIB1.
-  optional<unsigned> tracking_csi_slot_offset;
+  std::optional<unsigned> tracking_csi_slot_offset;
   /// \brief Slot offset for the zp-CSI-RS resources. If not set, it is automatically derived to avoid collisions with
   /// SSB and SIB1.
-  optional<unsigned> zp_csi_slot_offset;
+  std::optional<unsigned> zp_csi_slot_offset;
   /// \brief \c powerControlOffset, part of \c NZP-CSI-RS-Resource, as per TS 38.331.
   /// Power offset of PDSCH RE to NZP CSI-RS RE. Value in dB {-8,...,15}.
   int pwr_ctrl_offset = 0;
@@ -404,7 +404,7 @@ struct mac_bsr_unit_config {
   /// 2560, 5120, 10240}.
   unsigned retx_bsr_timer = 80;
   /// Logical Channel SR delay timer in nof. subframes. Values {20, 40, 64, 128, 512, 1024, 2560}.
-  optional<unsigned> lc_sr_delay_timer;
+  std::optional<unsigned> lc_sr_delay_timer;
 };
 
 /// MAC Power Headroom Reporting configuration.
@@ -418,7 +418,7 @@ struct mac_phr_unit_config {
 struct mac_sr_unit_config {
   /// \brief \c sr-ProhibitTimer, or timer for SR transmission on PUCCH.
   /// Values are in ms. Values: {1, 2, 4, 8, 16, 32, 64, 128}. When the field is absent, the UE applies the value 0.
-  optional<unsigned> sr_prohibit_timer;
+  std::optional<unsigned> sr_prohibit_timer;
   /// \brief \c sr-TransMax possible values, or maximum number of SR transmissions.
   /// Values: {4, 8, 16, 32, 64}.
   unsigned sr_trans_max = 64;
@@ -437,7 +437,7 @@ struct du_high_unit_mac_cell_group_config {
 /// PRACH application configuration.
 struct du_high_unit_prach_config {
   /// PRACH configuration index. If not specified, it is automatically derived to fit in an UL slot.
-  optional<unsigned> prach_config_index;
+  std::optional<unsigned> prach_config_index;
   /// PRACH root sequence index.
   unsigned prach_root_sequence_index = 1;
   /// Zero correlation zone
@@ -448,11 +448,11 @@ struct du_high_unit_prach_config {
   /// valid.
   int preamble_rx_target_pw = -100;
   /// Total number of PRACH preambles used for contention based and contention free 4-step or 2-step random access.
-  optional<unsigned> total_nof_ra_preambles;
+  std::optional<unsigned> total_nof_ra_preambles;
   /// Offset of lowest PRACH transmission occasion in frequency domain respective to PRB 0. To minimize interference
   /// with the PUCCH, the user should leave some guardband between the PUCCH CRBs and the PRACH PRBs.
   /// Possible values: {0,...,MAX_NOF_PRB - 1}.
-  optional<unsigned> prach_frequency_start;
+  std::optional<unsigned> prach_frequency_start;
   /// Max number of RA preamble transmissions performed before declaring a failure. Values {3, 4, 5, 6, 7, 8, 10, 20,
   /// 50, 100, 200}.
   uint8_t preamble_trans_max = 7;
@@ -479,7 +479,7 @@ struct du_high_unit_base_cell_config {
   /// Common subcarrier spacing for the entire resource grid. It must be supported by the band SS raster.
   subcarrier_spacing common_scs = subcarrier_spacing::kHz15;
   /// NR band.
-  optional<nr_band> band;
+  std::optional<nr_band> band;
   /// Channel bandwidth in MHz.
   bs_channel_bandwidth_fr1 channel_bw_mhz = bs_channel_bandwidth_fr1::MHz20;
   /// Number of antennas in downlink.
@@ -515,7 +515,7 @@ struct du_high_unit_base_cell_config {
   /// MAC Cell Gropup parameters.
   du_high_unit_mac_cell_group_config mcg_cfg;
   /// TDD slot configuration.
-  optional<du_high_unit_tdd_ul_dl_config> tdd_ul_dl_cfg;
+  std::optional<du_high_unit_tdd_ul_dl_config> tdd_ul_dl_cfg;
   /// Paging configuration.
   du_high_unit_paging_config paging_cfg;
   /// CSI configuration.
@@ -530,7 +530,7 @@ struct du_high_unit_test_mode_ue_config {
   /// \brief Delay, in slots, before the MAC test mode auto-generates the UCI/CRC indication to pass to the scheduler.
   /// This feature should be avoided if the OFH/UL PHY are operational, otherwise the auto-generated indications
   /// may interfere with the UL PHY HARQ handling.
-  optional<unsigned> auto_ack_indication_delay;
+  std::optional<unsigned> auto_ack_indication_delay;
   /// Whether PDSCH grants are automatically assigned to the test UE.
   bool pdsch_active = true;
   /// Whether PUSCH grants are automatically assigned to the test UE.
@@ -729,7 +729,7 @@ struct du_high_unit_config {
   /// Configuration for testing purposes.
   du_high_unit_test_mode_config test_mode_cfg = {};
   /// NTN configuration.
-  optional<ntn_config> ntn_cfg;
+  std::optional<ntn_config> ntn_cfg;
   /// \brief Cell configuration.
   ///
   /// \note Add one cell by default.

apps/units/flexible_du/du_high/du_high_config_cli11_schema.cpp

@@ -1285,11 +1285,11 @@ static void configure_cli11_ephemeris_info_orbital(CLI::App& app, orbital_coordi
       ->capture_default_str();
 }
 
-static void configure_cli11_ntn_args(CLI::App&              app,
-                                     optional<ntn_config>&  ntn,
-                                     epoch_time_t&          epoch_time,
-                                     orbital_coordinates_t& orbital_coordinates,
-                                     ecef_coordinates_t&    ecef_coordinates)
+static void configure_cli11_ntn_args(CLI::App&                  app,
+                                     std::optional<ntn_config>& ntn,
+                                     epoch_time_t&              epoch_time,
+                                     orbital_coordinates_t&     orbital_coordinates,
+                                     ecef_coordinates_t&        ecef_coordinates)
 {
   ntn_config& config = ntn.emplace();