diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index 9d68d42ed3c90f79c9c29e49047ec5fafa6433cf..6e0942c92dd214bd2bb16a165536b2e84ce82184 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -86,31 +86,6 @@ add_ue_dlsch_info(module_id_t module_idP,
return;
}
-//------------------------------------------------------------------------------
-int
-schedule_next_dlue(module_id_t module_idP,
- int CC_id,
- sub_frame_t subframeP)
-//------------------------------------------------------------------------------
-{
- int next_ue;
- UE_list_t *UE_list = &RC.mac[module_idP]->UE_info.list;
-
- for (next_ue = UE_list->head; next_ue >= 0; next_ue = UE_list->next[next_ue]) {
- if (eNB_dlsch_info[module_idP][CC_id][next_ue].status == S_DL_WAITING) {
- return next_ue;
- }
- }
-
- for (next_ue = UE_list->head; next_ue >= 0; next_ue = UE_list->next[next_ue]) {
- if (eNB_dlsch_info[module_idP][CC_id][next_ue].status == S_DL_BUFFERED) {
- eNB_dlsch_info[module_idP][CC_id][next_ue].status = S_DL_WAITING;
- }
- }
-
- return (-1); //next_ue;
-}
-
//------------------------------------------------------------------------------
int
generate_dlsch_header(unsigned char *mac_header,
@@ -2631,37 +2606,3 @@ schedule_PCH(module_id_t module_idP,
stop_meas(&eNB->schedule_pch);
return;
}
-
-static int
-slice_priority_compare(const void *_a,
- const void *_b,
- void *_c) {
- const int slice_id1 = *(const int *) _a;
- const int slice_id2 = *(const int *) _b;
- const module_id_t Mod_id = *(int *) _c;
- const slice_info_t *sli = &RC.mac[Mod_id]->slice_info;
-
- if (sli->dl[slice_id1].prio > sli->dl[slice_id2].prio) {
- return -1;
- }
-
- return 1;
-}
-
-void
-slice_priority_sort(module_id_t Mod_id,
- int slice_list[MAX_NUM_SLICES]) {
- int i;
- int n_dl = RC.mac[Mod_id]->slice_info.n_dl;
-
- for (i = 0; i < n_dl; i++) {
- slice_list[i] = i;
- }
-
- qsort_r(slice_list,
- n_dl,
- sizeof(int),
- slice_priority_compare,
- &Mod_id);
- return;
-}
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
index fdd4459c45ced8bbc854d4984fd0704b30d4520e..9072a3c87258009c6e68a2a905c5db333ecc1728 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
@@ -5043,13 +5043,3 @@ harq_indication(module_id_t mod_idP,
return;
}
-
-// Flexran Slicing functions
-//------------------------------------------------------------------------------
-uint16_t
-nb_rbs_allowed_slice(float rb_percentage,
- int total_rbs)
-//------------------------------------------------------------------------------
-{
- return (uint16_t) floor(rb_percentage * total_rbs);
-}
diff --git a/openair2/LAYER2/MAC/mac_proto.h b/openair2/LAYER2/MAC/mac_proto.h
index 0804dcd8c34108f89d99c35dfd6e18b5e47bfa27..f9deeeae4f5589d494f4b75e81768b3f6bfee6b8 100644
--- a/openair2/LAYER2/MAC/mac_proto.h
+++ b/openair2/LAYER2/MAC/mac_proto.h
@@ -448,14 +448,6 @@ uint8_t UE_is_to_be_scheduled(module_id_t module_idP, int CC_id,
module_id_t schedule_next_ulue(module_id_t module_idP, int UE_id,
sub_frame_t subframe);
-/** \brief Round-robin scheduler for DLSCH traffic.
-@param Mod_id Instance ID for eNB
-@param subframe Subframe number on which to act
-@returns UE index that is to be scheduled if needed/room
-*/
-int schedule_next_dlue(module_id_t module_idP, int CC_id,
- sub_frame_t subframe);
-
/* \brief Allocates a set of PRBS for a particular UE. This is a simple function for the moment, later it should process frequency-domain CQI information and/or PMI information. Currently it just returns the first PRBS that are available in the subframe based on the number requested.
@param UE_id Index of UE on which to act
@param nb_rb Number of PRBs allocated to UE by scheduler
@@ -1218,10 +1210,6 @@ void pre_scd_nb_rbs_required( module_id_t module_idP,
uint16_t nb_rbs_required[MAX_NUM_CCs][NUMBER_OF_UE_MAX]);
#endif
-/* Slice related functions */
-uint16_t nb_rbs_allowed_slice(float rb_percentage, int total_rbs);
-int ue_ul_slice_membership(module_id_t mod_id, int UE_id, int slice_idx);
-
/* DRX Configuration */
/* Configure local DRX timers and thresholds in UE context, following the drx_configuration input */
void eNB_Config_Local_DRX(instance_t Mod_id, rrc_mac_drx_config_req_t *rrc_mac_drx_config_req);
diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index a1cd64a7d57220cf77c16cec87fe292cd867fe67..d2b2f695e97a2a448df1e1616eba9a7149f6c796 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -196,12 +196,6 @@ int round_robin_dl(module_id_t Mod_id,
return n_rbg_sched;
}
-void
-sort_ue_ul(module_id_t module_idP,
- int sched_frameP,
- sub_frame_t sched_subframeP,
- rnti_t *rntiTable);
-
// This function stores the downlink buffer for all the logical channels
void
store_dlsch_buffer(module_id_t Mod_id,
@@ -271,31 +265,6 @@ store_dlsch_buffer(module_id_t Mod_id,
}
}
-int
-maxround_ul(module_id_t Mod_id, uint16_t rnti, int sched_frame,
- sub_frame_t sched_subframe) {
- uint8_t round, round_max = 0, UE_id;
- int CC_id, harq_pid;
- UE_info_t *UE_info = &RC.mac[Mod_id]->UE_info;
- COMMON_channels_t *cc;
-
- for (CC_id = 0; CC_id < RC.nb_mac_CC[Mod_id]; CC_id++) {
- cc = &RC.mac[Mod_id]->common_channels[CC_id];
- UE_id = find_UE_id(Mod_id, rnti);
-
- if(UE_id == -1)
- continue;
-
- harq_pid = subframe2harqpid(cc, sched_frame, sched_subframe);
- round = UE_info->UE_sched_ctrl[UE_id].round_UL[CC_id][harq_pid];
-
- if (round > round_max) {
- round_max = round;
- }
- }
-
- return round_max;
-}
// This function assigns pre-available RBS to each UE in specified sub-bands before scheduling is done
void
@@ -433,11 +402,7 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
UE_info_t *UE_info = &eNB->UE_info;
const int N_RB_UL = to_prb(eNB->common_channels[CC_id].ul_Bandwidth);
uint16_t available_rbs = N_RB_UL - 2 * first_rb[CC_id]; // top and bottom // - UE_info->first_rb_offset[CC_id];
- rnti_t rntiTable[MAX_MOBILES_PER_ENB];
- // sort ues
- LOG_D(MAC, "In ulsch_preprocessor: sort ue \n");
- sort_ue_ul(module_idP, sched_frameP, sched_subframeP, rntiTable);
// maximize MCS and then allocate required RB according to the buffer occupancy with the limit of max available UL RB
LOG_D(MAC, "In ulsch_preprocessor: assign max mcs min rb\n");
assign_max_mcs_min_rb(module_idP, CC_id, frameP, subframeP, first_rb);
@@ -474,10 +439,9 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
nb_allocated_rbs[UE_id] = cmin(UE_info->UE_template[CC_id][UE_id].pre_allocated_nb_rb_ul, average_rbs_per_user);
total_allocated_rbs += nb_allocated_rbs[UE_id];
- LOG_D(MAC, "In ulsch_preprocessor: assigning %d RBs for UE %d/%x CCid %d, harq_pid %d\n",
+ LOG_D(MAC, "In ulsch_preprocessor: assigning %d RBs for UE %d CCid %d, harq_pid %d\n",
nb_allocated_rbs[UE_id],
UE_id,
- rntiTable[UE_id],
CC_id,
harq_pid);
}
@@ -607,120 +571,3 @@ assign_max_mcs_min_rb(module_id_t module_idP,
}
}
}
-
-struct sort_ue_ul_params {
- int module_idP;
- int sched_frameP;
- int sched_subframeP;
-};
-
-static int ue_ul_compare(const void *_a, const void *_b, void *_params) {
- struct sort_ue_ul_params *params = _params;
- UE_info_t *UE_info = &RC.mac[params->module_idP]->UE_info;
- int UE_id1 = *(const int *) _a;
- int UE_id2 = *(const int *) _b;
- int rnti1 = UE_RNTI(params->module_idP, UE_id1);
- int pCCid1 = UE_PCCID(params->module_idP, UE_id1);
- int round1 = maxround_ul(params->module_idP, rnti1, params->sched_frameP,
- params->sched_subframeP);
- int rnti2 = UE_RNTI(params->module_idP, UE_id2);
- int pCCid2 = UE_PCCID(params->module_idP, UE_id2);
- int round2 = maxround_ul(params->module_idP, rnti2, params->sched_frameP,
- params->sched_subframeP);
-
- if (round1 > round2)
- return -1;
-
- if (round1 < round2)
- return 1;
-
- if (UE_info->UE_template[pCCid1][UE_id1].ul_buffer_info[LCGID0] >
- UE_info->UE_template[pCCid2][UE_id2].ul_buffer_info[LCGID0])
- return -1;
-
- if (UE_info->UE_template[pCCid1][UE_id1].ul_buffer_info[LCGID0] <
- UE_info->UE_template[pCCid2][UE_id2].ul_buffer_info[LCGID0])
- return 1;
-
- int bytes_to_schedule1 = UE_info->UE_template[pCCid1][UE_id1].estimated_ul_buffer - UE_info->UE_template[pCCid1][UE_id1].scheduled_ul_bytes;
-
- if (bytes_to_schedule1 < 0) bytes_to_schedule1 = 0;
-
- int bytes_to_schedule2 = UE_info->UE_template[pCCid2][UE_id2].estimated_ul_buffer - UE_info->UE_template[pCCid2][UE_id2].scheduled_ul_bytes;
-
- if (bytes_to_schedule2 < 0) bytes_to_schedule2 = 0;
-
- if (bytes_to_schedule1 > bytes_to_schedule2)
- return -1;
-
- if (bytes_to_schedule1 < bytes_to_schedule2)
- return 1;
-
- if (UE_info->UE_template[pCCid1][UE_id1].pre_assigned_mcs_ul >
- UE_info->UE_template[pCCid2][UE_id2].pre_assigned_mcs_ul)
- return -1;
-
- if (UE_info->UE_template[pCCid1][UE_id1].pre_assigned_mcs_ul <
- UE_info->UE_template[pCCid2][UE_id2].pre_assigned_mcs_ul)
- return 1;
-
- if (UE_info->UE_sched_ctrl[UE_id1].cqi_req_timer >
- UE_info->UE_sched_ctrl[UE_id2].cqi_req_timer)
- return -1;
-
- if (UE_info->UE_sched_ctrl[UE_id1].cqi_req_timer <
- UE_info->UE_sched_ctrl[UE_id2].cqi_req_timer)
- return 1;
-
- return 0;
-}
-
-//-----------------------------------------------------------------------------
-/*
- * This function sorts the UEs in order, depending on their ulsch buffer and CQI
- */
-void sort_ue_ul(module_id_t module_idP,
- int sched_frameP,
- sub_frame_t sched_subframeP,
- rnti_t *rntiTable)
-//-----------------------------------------------------------------------------
-{
- int list[MAX_MOBILES_PER_ENB];
- int list_size = 0;
- struct sort_ue_ul_params params = { module_idP, sched_frameP, sched_subframeP };
- UE_info_t *UE_info = &RC.mac[module_idP]->UE_info;
- UE_sched_ctrl_t *UE_scheduling_control = NULL;
-
- for (int i = 0; i < MAX_MOBILES_PER_ENB; i++) {
- UE_scheduling_control = &(UE_info->UE_sched_ctrl[i]);
-
- /* Check CDRX configuration and if UE is in active time for this subframe */
- if (UE_scheduling_control->cdrx_configured == TRUE) {
- if (UE_scheduling_control->in_active_time == FALSE) {
- continue;
- }
- }
-
- rntiTable[i] = UE_RNTI(module_idP, i);
-
- // Valid element and is not the actual CC_id in the list
- if (UE_info->active[i] == TRUE &&
- rntiTable[i] != NOT_A_RNTI &&
- UE_info->UE_sched_ctrl[i].ul_out_of_sync != 1) {
- list[list_size++] = i; // Add to list
- }
- }
-
- qsort_r(list, list_size, sizeof(int), ue_ul_compare, ¶ms);
-
- if (list_size) { // At mimimum one list element
- for (int i = 0; i < list_size - 1; i++) {
- UE_info->list.next[list[i]] = list[i + 1];
- }
-
- UE_info->list.next[list[list_size - 1]] = -1;
- UE_info->list.head = list[0];
- } else { // No element
- UE_info->list.head = -1;
- }
-}