maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug header

Browse Source
This commit is contained in:
shahab SHARIATBAGHERI
2017-05-18 17:21:07 +02:00
parent 5de045b802
commit 5c7377e1c0
3 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/flexran_agent_mac_proto.h
+16 -1
View File
@@ -39,13 +39,19 @@
/* /*
* slice specific scheduler * slice specific scheduler
*/ */
typedef void (*slice_scheduler)(module_id_t mod_id, typedef void (*slice_scheduler_dl)(module_id_t mod_id,
int slice_id, int slice_id,
uint32_t frame, uint32_t frame,
uint32_t subframe, uint32_t subframe,
int *mbsfn_flag, int *mbsfn_flag,
Protocol__FlexranMessage **dl_info); Protocol__FlexranMessage **dl_info);
typedef void (*slice_scheduler_ul)(module_id_t mod_id,
frame_t frame,
unsigned char cooperation_flag,
uint32_t subframe,
unsigned char sched_subframe,
Protocol__FlexranMessage **ul_info);
/* /*
@@ -109,6 +115,15 @@ flexran_schedule_ue_dl_spec_common(mid_t mod_id,
int *mbsfn_flag, int *mbsfn_flag,
Protocol__FlexranMessage **dl_info); Protocol__FlexranMessage **dl_info);
void
flexran_schedule_ue_ul_spec_default(mid_t mod_id,
uint32_t frame,
uint32_t cooperation_flag,
int subframe,
unsigned char sched_subframe,
Protocol__FlexranMessage **ul_info);
uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage, uint16_t flexran_nb_rbs_allowed_slice(float rb_percentage,
int total_rbs); int total_rbs);
openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
+6 -6
View File
@@ -88,8 +88,8 @@ typedef enum {
// number of active slices for past and current time // number of active slices for past and current time
int n_active_slices = 1; static int n_active_slices = 1;
int n_active_slices_current = 1; static int n_active_slices_current = 1;
// ue to slice mapping // ue to slice mapping
int slicing_strategy = UEID_TO_SLICEID; int slicing_strategy = UEID_TO_SLICEID;
@@ -115,7 +115,7 @@ char *dl_scheduler_type[MAX_NUM_SLICES] = {"flexran_schedule_ue_spec_embb",
}; };
// pointer to the slice specific scheduler // pointer to the slice specific scheduler
slice_scheduler slice_sched[MAX_NUM_SLICES] = {0}; slice_scheduler_dl slice_sched_dl[MAX_NUM_SLICES] = {0};
/** /**
@@ -729,7 +729,7 @@ flexran_schedule_ue_dl_spec_default(mid_t mod_id,
// Load any updated functions // Load any updated functions
if (update_dl_scheduler[i] > 0 ) { if (update_dl_scheduler[i] > 0 ) {
slice_sched[i] = dlsym(NULL, dl_scheduler_type[i]); slice_sched_dl[i] = dlsym(NULL, dl_scheduler_type[i]);
update_dl_scheduler[i] = 0; update_dl_scheduler[i] = 0;
update_dl_scheduler_current[i] = 0; update_dl_scheduler_current[i] = 0;
slice_percentage_current[i]= slice_percentage[i]; slice_percentage_current[i]= slice_percentage[i];
@@ -806,7 +806,7 @@ flexran_schedule_ue_dl_spec_default(mid_t mod_id,
// Run each enabled slice-specific schedulers one by one // Run each enabled slice-specific schedulers one by one
//LOG_N(MAC,"[eNB %d]frame %d subframe %d slice %d: calling the scheduler\n", mod_id, frame, subframe,i); //LOG_N(MAC,"[eNB %d]frame %d subframe %d slice %d: calling the scheduler\n", mod_id, frame, subframe,i);
slice_sched[i](mod_id, i, frame, subframe, mbsfn_flag,dl_info); slice_sched_dl[i](mod_id, i, frame, subframe, mbsfn_flag,dl_info);
} }
@@ -894,7 +894,7 @@ flexran_schedule_ue_spec_urllc(mid_t mod_id,
Protocol__FlexranMessage **dl_info) Protocol__FlexranMessage **dl_info)
{ {
flexran_schedule_ue_spec_dl_common(mod_id, flexran_schedule_ue_dl_spec_common(mod_id,
slice_id, slice_id,
frame, frame,
subframe, subframe,
openair2/LAYER2/MAC/flexran_agent_scheduler_ulsch_ue.c
+49 -39
View File
@@ -35,6 +35,7 @@
#include "SCHED/defs.h" #include "SCHED/defs.h"
#include "SCHED/extern.h" #include "SCHED/extern.h"
#include "LAYER2/MAC/flexran_agent_mac_proto.h"
#include "LAYER2/MAC/defs.h" #include "LAYER2/MAC/defs.h"
#include "LAYER2/MAC/proto.h" #include "LAYER2/MAC/proto.h"
#include "LAYER2/MAC/extern.h" #include "LAYER2/MAC/extern.h"
@@ -56,22 +57,30 @@
#include "T.h" #include "T.h"
// #define ENABLE_MAC_PAYLOAD_DEBUG /* number of active slices for past and current time*/
// #define DEBUG_eNB_SCHEDULER 1 static int n_active_slices = 1;
static int n_active_slices_current = 1;
/* RB share for each slice for past and current time*/
// RB share for each slice for past and current time float slice_percentage_uplink[MAX_NUM_SLICES] = {0.8, 0.2, 0.0, 0.0};
float slice_percentage_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
float slice_percentage_current_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0}; float slice_percentage_current_uplink[MAX_NUM_SLICES] = {1.0, 0.0, 0.0, 0.0};
float total_slice_percentage_uplink = 0;
/*resource blocks allowed*/
uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES]; static uint16_t nb_rbs_allowed_slice[MAX_NUM_CCs][MAX_NUM_SLICES];
/*Slice Update */
int update_ul_scheduler[MAX_NUM_SLICES] = {1, 1, 1, 1}; int update_ul_scheduler[MAX_NUM_SLICES] = {1, 1, 1, 1};
int update_ul_scheduler_current[MAX_NUM_SLICES] = {1, 1, 1, 1}; int update_ul_scheduler_current[MAX_NUM_SLICES] = {1, 1, 1, 1};
// name of available scheduler /* Slice Function Pointer */
char *ul_scheduler_type[MAX_NUM_SLICES] = {"flexran_schedule_ue_ul_spec_embb"}; slice_scheduler_ul slice_sched_ul[MAX_NUM_SLICES] = {0};
/* name of available scheduler*/
char *ul_scheduler_type[MAX_NUM_SLICES] = {"flexran_schedule_ue_ul_spec_embb",
"flexran_schedule_ue_ul_spec_urllc",
"flexran_schedule_ue_ul_spec_mmtc",
"flexran_schedule_ue_ul_spec_be" // best effort
};
uint16_t flexran_nb_rbs_allowed_slice_uplink(float rb_percentage, int total_rbs){ uint16_t flexran_nb_rbs_allowed_slice_uplink(float rb_percentage, int total_rbs){
@@ -387,25 +396,26 @@ void _ulsch_scheduler_pre_processor(module_id_t module_idP,
void void
flexran_schedule_ue_ul_spec_default(mid_t mod_id, flexran_schedule_ue_ul_spec_default(mid_t mod_id,
uint32_t frame, uint32_t frame,
uint32_t subframe, uint32_t cooperation_flag,
int *mbsfn_flag, int subframe,
Protocol__FlexranMessage **dl_info) unsigned char sched_subframe,
Protocol__FlexranMessage **ul_info)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
{ {
int i=0; int i=0;
flexran_agent_mac_create_empty_ul_config(module_idP, ul_info); flexran_agent_mac_create_empty_ul_config(mod_id, ul_info);
for (i = 0; i < n_active_slices; i++) { for (i = 0; i < n_active_slices; i++) {
// Load any updated functions // Load any updated functions
if (update_dl_scheduler[i] > 0 ) { if (update_ul_scheduler[i] > 0 ) {
slice_sched[i] = dlsym(NULL, dl_scheduler_type[i]); slice_sched_ul[i] = dlsym(NULL, ul_scheduler_type[i]);
update_dl_scheduler[i] = 0; update_ul_scheduler[i] = 0;
update_dl_scheduler_current[i] = 0; update_ul_scheduler_current[i] = 0;
slice_percentage_current[i]= slice_percentage[i]; slice_percentage_current_uplink[i]= slice_percentage_uplink[i];
total_slice_percentage+=slice_percentage[i]; total_slice_percentage_uplink+=slice_percentage_uplink[i];
LOG_N(MAC,"update dl scheduler slice %d\n", i); LOG_N(MAC,"update ul scheduler slice %d\n", i);
} }
// check if the number of slices has changed, and log // check if the number of slices has changed, and log
@@ -423,45 +433,45 @@ flexran_schedule_ue_ul_spec_default(mid_t mod_id,
} }
// check if the slice rb share has changed, and log the console // check if the slice rb share has changed, and log the console
if (slice_percentage_current[i] != slice_percentage[i]){ if (slice_percentage_current_uplink[i] != slice_percentage_uplink[i]){
if ((slice_percentage[i] >= 0.0) && (slice_percentage[i] <= 1.0)){ if ((slice_percentage_uplink[i] >= 0.0) && (slice_percentage_uplink[i] <= 1.0)){
if ((total_slice_percentage - slice_percentage_current[i] + slice_percentage[i]) <= 1.0) { if ((total_slice_percentage_uplink - slice_percentage_current_uplink[i] + slice_percentage_uplink[i]) <= 1.0) {
total_slice_percentage=total_slice_percentage - slice_percentage_current[i] + slice_percentage[i]; total_slice_percentage_uplink=total_slice_percentage_uplink - slice_percentage_current_uplink[i] + slice_percentage_uplink[i];
LOG_N(MAC,"[eNB %d][SLICE %d] frame %d subframe %d: total percentage %f, slice RB percentage has changed: %f-->%f\n", LOG_N(MAC,"[eNB %d][SLICE %d] frame %d subframe %d: total percentage %f, slice RB percentage has changed: %f-->%f\n",
mod_id, i, frame, subframe, total_slice_percentage, slice_percentage_current[i], slice_percentage[i]); mod_id, i, frame, subframe, total_slice_percentage_uplink, slice_percentage_current_uplink[i], slice_percentage_uplink[i]);
slice_percentage_current[i] = slice_percentage[i]; slice_percentage_current_uplink[i] = slice_percentage_uplink[i];
} else { } else {
LOG_W(MAC,"[eNB %d][SLICE %d] invalid total RB share (%f->%f), revert the previous value (%f->%f)\n", LOG_W(MAC,"[eNB %d][SLICE %d] invalid total RB share (%f->%f), revert the previous value (%f->%f)\n",
mod_id,i, mod_id,i,
total_slice_percentage, total_slice_percentage_uplink,
total_slice_percentage - slice_percentage_current[i] + slice_percentage[i], total_slice_percentage_uplink - slice_percentage_current_uplink[i] + slice_percentage_uplink[i],
slice_percentage[i],slice_percentage_current[i]); slice_percentage_uplink[i],slice_percentage_current_uplink[i]);
slice_percentage[i]= slice_percentage_current[i]; slice_percentage_uplink[i]= slice_percentage_current_uplink[i];
} }
} else { } else {
LOG_W(MAC,"[eNB %d][SLICE %d] invalid slice RB share, revert the previous value (%f->%f)\n",mod_id, i, slice_percentage[i],slice_percentage_current[i]); LOG_W(MAC,"[eNB %d][SLICE %d] invalid slice RB share, revert the previous value (%f->%f)\n",mod_id, i, slice_percentage_uplink[i],slice_percentage_current_uplink[i]);
slice_percentage[i]= slice_percentage_current[i]; slice_percentage_uplink[i]= slice_percentage_current_uplink[i];
} }
} }
// check if a new scheduler, and log the console // check if a new scheduler, and log the console
if (update_dl_scheduler_current[i] != update_dl_scheduler[i]){ if (update_ul_scheduler_current[i] != update_ul_scheduler[i]){
LOG_N(MAC,"[eNB %d][SLICE %d] frame %d subframe %d: DL scheduler for this slice is updated: %s \n", LOG_N(MAC,"[eNB %d][SLICE %d] frame %d subframe %d: DL scheduler for this slice is updated: %s \n",
mod_id, i, frame, subframe, dl_scheduler_type[i]); mod_id, i, frame, subframe, ul_scheduler_type[i]);
update_dl_scheduler_current[i] = update_dl_scheduler[i]; update_ul_scheduler_current[i] = update_ul_scheduler[i];
} }
// Run each enabled slice-specific schedulers one by one // Run each enabled slice-specific schedulers one by one
//LOG_N(MAC,"[eNB %d]frame %d subframe %d slice %d: calling the scheduler\n", mod_id, frame, subframe,i); //LOG_N(MAC,"[eNB %d]frame %d subframe %d slice %d: calling the scheduler\n", mod_id, frame, subframe,i);
slice_sched[i](mod_id, i, frame, subframe, mbsfn_flag,dl_info); slice_sched_ul[i](mod_id, frame, cooperation_flag, subframe, sched_subframe,ul_info);
} }
@@ -469,7 +479,7 @@ flexran_schedule_ue_ul_spec_default(mid_t mod_id,
void void
flexran_schedule_ue_ul_spec_embb(mid_t mod_id, flexran_schedule_ue_ul_spec_embb(mid_t mod_id,
frame_t frameP, frame_t frame,
unsigned char cooperation_flag, unsigned char cooperation_flag,
uint32_t subframe, uint32_t subframe,
unsigned char sched_subframe, unsigned char sched_subframe,
@@ -583,7 +593,7 @@ void flexran_agent_schedule_ulsch_rnti(module_id_t module_idP,
// LOG_I(MAC,"entering ulsch preprocesor\n"); // LOG_I(MAC,"entering ulsch preprocesor\n");
/*TODO*/
int slice_id = 0; int slice_id = 0;