Commit 1c47a4ad authored by root's avatar root

NVS Slice

parent 5f29bf4b
libcjson.so.1
\ No newline at end of file
libcjson.so.1.7.14
\ No newline at end of file
...@@ -14,7 +14,7 @@ eNBs = ...@@ -14,7 +14,7 @@ eNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 95; mnc_length = 2; } ); plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
tr_s_preference = "local_mac" tr_s_preference = "local_mac"
...@@ -179,7 +179,7 @@ eNBs = ...@@ -179,7 +179,7 @@ eNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "192.168.174.131"; mme_ip_address = ( { ipv4 = "192.168.174.130";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -196,12 +196,12 @@ eNBs = ...@@ -196,12 +196,12 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "ens192"; ENB_INTERFACE_NAME_FOR_S1_MME = "ens192";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.174.130"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.174.131/24";
ENB_INTERFACE_NAME_FOR_S1U = "ens192"; ENB_INTERFACE_NAME_FOR_S1U = "ens192";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.174.130"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.174.131/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.174.128"; ENB_IPV4_ADDRESS_FOR_X2C = "192.168.174.131/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422 ENB_PORT_FOR_X2C = 36422; # Spec 36422
}; };
} }
...@@ -216,9 +216,9 @@ MACRLCs = ( ...@@ -216,9 +216,9 @@ MACRLCs = (
# puSch10xSnr = 160; # puSch10xSnr = 160;
# puCch10xSnr = 160; # puCch10xSnr = 160;
num_cc = 1; num_cc = 1;
local_s_if_name = "ens192"; local_n_if_name = "ens192";
remote_s_address = "192.168.174.129"; remote_n_address = "192.168.174.132";
local_s_address = "192.168.174.130"; local_n_address = "192.168.174.131";
local_s_portc = 50001; local_s_portc = 50001;
remote_s_portc = 50000; remote_s_portc = 50000;
local_s_portd = 50011; local_s_portd = 50011;
...@@ -264,8 +264,8 @@ THREAD_STRUCT = ( ...@@ -264,8 +264,8 @@ THREAD_STRUCT = (
NETWORK_CONTROLLER : NETWORK_CONTROLLER :
{ {
FLEXRAN_ENABLED = "yes"; FLEXRAN_ENABLED = "yes";
FLEXRAN_INTERFACE_NAME = "lo"; FLEXRAN_INTERFACE_NAME = "ens192";
FLEXRAN_IPV4_ADDRESS = "127.0.0.1"; FLEXRAN_IPV4_ADDRESS = "192.168.174.130";
FLEXRAN_PORT = 2210; FLEXRAN_PORT = 2210;
FLEXRAN_CACHE = "/mnt/oai_agent_cache"; FLEXRAN_CACHE = "/mnt/oai_agent_cache";
FLEXRAN_AWAIT_RECONF = "no"; FLEXRAN_AWAIT_RECONF = "no";
......
...@@ -3036,6 +3036,7 @@ int flexran_set_dl_slice_algo(mid_t mod_id, Protocol__FlexSliceAlgorithm algo) { ...@@ -3036,6 +3036,7 @@ int flexran_set_dl_slice_algo(mid_t mod_id, Protocol__FlexSliceAlgorithm algo) {
mac->pre_processor_dl = static_dl_init(mod_id, cc_id); mac->pre_processor_dl = static_dl_init(mod_id, cc_id);
break; break;
default: default:
//如未指定slice算法,则回归原有的调度!
mac->pre_processor_dl.algorithm = 0; mac->pre_processor_dl.algorithm = 0;
mac->pre_processor_dl.dl = dlsch_scheduler_pre_processor; mac->pre_processor_dl.dl = dlsch_scheduler_pre_processor;
mac->pre_processor_dl.dl_algo.data = mac->pre_processor_dl.dl_algo.setup(); mac->pre_processor_dl.dl_algo.data = mac->pre_processor_dl.dl_algo.setup();
......
...@@ -325,6 +325,7 @@ void static_dl(module_id_t mod_id, ...@@ -325,6 +325,7 @@ void static_dl(module_id_t mod_id,
max_num_ue = 1; max_num_ue = 1;
break; break;
} }
//先给每个Slice里面
for (int i = 0; i < s->num; ++i) { for (int i = 0; i < s->num; ++i) {
if (s->s[i]->UEs.head < 0) if (s->s[i]->UEs.head < 0)
continue; continue;
...@@ -380,7 +381,7 @@ void static_dl(module_id_t mod_id, ...@@ -380,7 +381,7 @@ void static_dl(module_id_t mod_id,
for (int j = 0; j < RBGsize; j++) { for (int j = 0; j < RBGsize; j++) {
if (vrb_map[RBGsize*i+j] != 0) { if (vrb_map[RBGsize*i+j] != 0) {
LOG_I(MAC, "%4d.%d DL scheduler allocation list: %s\n", frame, subframe, t); LOG_I(MAC, "%4d.%d DL scheduler allocation list: %s\n", frame, subframe, t);
LOG_E(MAC, "%4d.%d: UE %d allocated at locked RB %d/RBG %d\n", frame, LOG_I(MAC, "%4d.%d: UE %d allocated at locked RB %d/RBG %d\n", frame,
subframe, UE_id, RBGsize * i + j, i); subframe, UE_id, RBGsize * i + j, i);
} }
vrb_map[RBGsize*i+j] = 1; vrb_map[RBGsize*i+j] = 1;
...@@ -599,3 +600,7 @@ pp_impl_param_t static_ul_init(module_id_t mod_id, int CC_id) { ...@@ -599,3 +600,7 @@ pp_impl_param_t static_ul_init(module_id_t mod_id, int CC_id) {
return sttc; return sttc;
} }
/************************ NVS Slicing Implementation ************************/
/************************ SVN19 Slicing Implementation ************************/
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment