sched: rename prb ratios parameters for slicing

Author: frankist

include/srsran/scheduler/config/cell_rrm_policy_config.h renamed to include/srsran/scheduler/config/slice_rrm_policy_config.h

@@ -16,13 +16,13 @@
 namespace srsran {
 
 /// Cell-specific Default RAN slice configuration.
-struct cell_rrm_policy_config {
+struct slice_rrm_policy_config {
   /// RRM Policy identifier.
   rrm_policy_member rrc_member;
-  /// Sets the minimum percentage of PRBs to be allocated to this group.
-  unsigned min_prb_ratio = 0;
-  /// Sets the maximum percentage of PRBs to be allocated to this group.
-  unsigned max_prb_ratio = MAX_NOF_PRBS;
+  /// Sets the minimum number of PRBs to be allocated to this group.
+  unsigned min_prb = 0;
+  /// Sets the maximum number of PRBs to be allocated to this group.
+  unsigned max_prb = MAX_NOF_PRBS;
 };
 
 } // namespace srsran

include/srsran/scheduler/scheduler_configurator.h

@@ -31,11 +31,11 @@
 #include "srsran/ran/subcarrier_spacing.h"
 #include "srsran/ran/tdd/tdd_ul_dl_config.h"
 #include "srsran/scheduler/config/bwp_configuration.h"
-#include "srsran/scheduler/config/cell_rrm_policy_config.h"
 #include "srsran/scheduler/config/dmrs.h"
 #include "srsran/scheduler/config/logical_channel_config.h"
 #include "srsran/scheduler/config/serving_cell_config.h"
 #include "srsran/scheduler/config/si_scheduling_config.h"
+#include "srsran/scheduler/config/slice_rrm_policy_config.h"
 #include "srsran/scheduler/scheduler_dci.h"
 
 namespace srsran {
@@ -93,7 +93,7 @@ struct sched_cell_configuration_request_message {
   std::vector<nzp_csi_rs_resource> nzp_csi_rs_res_list;
 
   /// List of RAN slices to support in the scheduler.
-  std::vector<cell_rrm_policy_config> rrm_policy_members;
+  std::vector<slice_rrm_policy_config> rrm_policy_members;
 
   unsigned ntn_cs_koffset = 0;
 };

lib/scheduler/config/cell_configuration.h

@@ -56,7 +56,7 @@ class cell_configuration
   std::vector<nzp_csi_rs_resource> nzp_csi_rs_list;
 
   /// List of RRM Policy members configured for this cell.
-  std::vector<cell_rrm_policy_config> rrm_policy_members;
+  std::vector<slice_rrm_policy_config> rrm_policy_members;
 
   // Derived Parameters.
   ssb_pattern_case ssb_case;

lib/scheduler/slicing/ran_slice_candidate.h

@@ -34,9 +34,9 @@ class common_ran_slice_candidate
 public:
   common_ran_slice_candidate(ran_slice_instance* instance_) : inst(instance_, candidate_deleter{}) {}
 
-  ran_slice_id_t                              id() const { return inst->id; }
-  [[nodiscard]] const cell_rrm_policy_config& cfg() const { return inst->cfg; }
-  scheduler_policy&                           policy() { return *inst->policy; }
+  ran_slice_id_t                               id() const { return inst->id; }
+  [[nodiscard]] const slice_rrm_policy_config& cfg() const { return inst->cfg; }
+  scheduler_policy&                            policy() { return *inst->policy; }
 
   bool is_candidate(du_ue_index_t ue_idx) const { return inst->is_candidate(ue_idx); }
   bool is_candidate(du_ue_index_t ue_idx, lcid_t lcid) const { return inst->is_candidate(ue_idx, lcid); }
@@ -58,9 +58,9 @@ class common_ran_slice_candidate
   [[nodiscard]] unsigned remaining_rbs() const
   {
     if constexpr (IsDl) {
-      return inst->cfg.max_prb_ratio < inst->pdsch_rb_count ? 0 : inst->cfg.max_prb_ratio - inst->pdsch_rb_count;
+      return inst->cfg.max_prb < inst->pdsch_rb_count ? 0 : inst->cfg.max_prb - inst->pdsch_rb_count;
     }
-    return inst->cfg.max_prb_ratio < inst->pusch_rb_count ? 0 : inst->cfg.max_prb_ratio - inst->pusch_rb_count;
+    return inst->cfg.max_prb < inst->pusch_rb_count ? 0 : inst->cfg.max_prb - inst->pusch_rb_count;
   }
 
 protected:

lib/scheduler/slicing/ran_slice_instance.cpp

@@ -12,9 +12,9 @@
 
 using namespace srsran;
 
-ran_slice_instance::ran_slice_instance(ran_slice_id_t                id_,
-                                       const cell_configuration&     cell_cfg_,
-                                       const cell_rrm_policy_config& cfg_) :
+ran_slice_instance::ran_slice_instance(ran_slice_id_t                 id_,
+                                       const cell_configuration&      cell_cfg_,
+                                       const slice_rrm_policy_config& cfg_) :
   id(id_), cell_cfg(&cell_cfg_), cfg(cfg_)
 {
 }

lib/scheduler/slicing/ran_slice_instance.h

@@ -13,7 +13,7 @@
 #include "../config/cell_configuration.h"
 #include "../policy/scheduler_policy.h"
 #include "ran_slice_id.h"
-#include "srsran/scheduler/config/cell_rrm_policy_config.h"
+#include "srsran/scheduler/config/slice_rrm_policy_config.h"
 
 namespace srsran {
 
@@ -23,26 +23,26 @@ class ran_slice_instance
 public:
   constexpr static int skip_slice_prio = std::numeric_limits<int>::min();
 
-  ran_slice_instance(ran_slice_id_t id_, const cell_configuration& cell_cfg_, const cell_rrm_policy_config& cfg_);
+  ran_slice_instance(ran_slice_id_t id_, const cell_configuration& cell_cfg_, const slice_rrm_policy_config& cfg_);
 
   void slot_indication();
 
   bool active() const { return not bearers.empty(); }
 
   int get_dl_prio()
   {
-    if (not active() or pdsch_stopped or cfg.max_prb_ratio <= pdsch_rb_count) {
+    if (not active() or pdsch_stopped or cfg.max_prb <= pdsch_rb_count) {
       return skip_slice_prio;
     }
-    return cfg.min_prb_ratio > pdsch_rb_count ? cfg.min_prb_ratio - pdsch_rb_count : 0;
+    return cfg.min_prb > pdsch_rb_count ? cfg.min_prb - pdsch_rb_count : 0;
   }
 
   int get_ul_prio()
   {
-    if (not active() or pusch_stopped or cfg.max_prb_ratio <= pusch_rb_count) {
+    if (not active() or pusch_stopped or cfg.max_prb <= pusch_rb_count) {
       return skip_slice_prio;
     }
-    return cfg.min_prb_ratio > pusch_rb_count ? cfg.min_prb_ratio - pusch_rb_count : 0;
+    return cfg.min_prb > pusch_rb_count ? cfg.min_prb - pusch_rb_count : 0;
   }
 
   /// Save PDSCH grant.
@@ -72,7 +72,7 @@ class ran_slice_instance
 
   ran_slice_id_t            id;
   const cell_configuration* cell_cfg;
-  cell_rrm_policy_config    cfg;
+  slice_rrm_policy_config   cfg;
 
   std::unique_ptr<scheduler_policy> policy;
 

lib/scheduler/slicing/slice_scheduler.cpp

@@ -14,7 +14,7 @@
 
 using namespace srsran;
 
-slice_scheduler::slice_scheduler(const cell_configuration& cell_cfg_, const cell_rrm_policy_config& cfg_) :
+slice_scheduler::slice_scheduler(const cell_configuration& cell_cfg_, const slice_rrm_policy_config& cfg_) :
   cell_cfg(cell_cfg_), logger(srslog::fetch_basic_logger("SCHED"))
 {
   // Create a number of slices equal to the number of configured RRM Policy members + 1 (default slice).
@@ -25,13 +25,13 @@ slice_scheduler::slice_scheduler(const cell_configuration& cell_cfg_, const cell
   // Create RAN slice instances.
   ran_slice_id_t id_count{0};
   // Default slice.
-  slices.emplace_back(id_count, cell_cfg, cell_rrm_policy_config{});
+  slices.emplace_back(id_count, cell_cfg, slice_rrm_policy_config{});
   slices.back().policy =
       create_scheduler_strategy(scheduler_strategy_params{"time_rr", &logger}, cell_cfg.expert_cfg.ue);
   sorted_dl_prios.emplace_back(id_count);
   sorted_ul_prios.emplace_back(id_count);
   // Configured RRM policy members
-  for (const cell_rrm_policy_config& rrm : cell_cfg.rrm_policy_members) {
+  for (const slice_rrm_policy_config& rrm : cell_cfg.rrm_policy_members) {
     slices.emplace_back(id_count, cell_cfg, rrm);
     slices.back().policy =
         create_scheduler_strategy(scheduler_strategy_params{"time_rr", &logger}, cell_cfg.expert_cfg.ue);

lib/scheduler/slicing/slice_scheduler.h

@@ -20,7 +20,7 @@ namespace srsran {
 class slice_scheduler
 {
 public:
-  slice_scheduler(const cell_configuration& cell_cfg_, const cell_rrm_policy_config& cfg_);
+  slice_scheduler(const cell_configuration& cell_cfg_, const slice_rrm_policy_config& cfg_);
 
   /// Reset the state of the slices.
   void slot_indication();