Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
b5177eb7
Commit
b5177eb7
authored
Dec 13, 2023
by
Chieh-Chun Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: use min prb ratio as parameter for NVS algo
parent
8eb350c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
7 deletions
+22
-7
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
+22
-7
No files found.
openair2/E2AP/RAN_FUNCTION/O-RAN/ran_func_rc.c
View file @
b5177eb7
...
@@ -243,13 +243,28 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
...
@@ -243,13 +243,28 @@ static bool add_mod_rc_slice(int mod_id, size_t slices_len, ran_param_list_t* ls
free
(
rc_sd_str
);
free
(
rc_sd_str
);
///// SLICE NVS CAP /////
///// SLICE NVS CAP /////
seq_ran_param_t
*
Dedicated_PRB_Policy_Ratio
=
&
RRM_Policy_Ratio_Group
->
ran_param_struct
.
ran_param_struct
[
3
];
seq_ran_param_t
*
Min_PRB_Policy_Ratio
=
&
RRM_Policy_Ratio_Group
->
ran_param_struct
.
ran_param_struct
[
1
];
assert
(
Dedicated_PRB_Policy_Ratio
->
ran_param_id
==
Dedicated_PRB_Policy_Ratio_8_4_3_6
&&
"wrong Dedicated_PRB_Policy_Ratio id"
);
assert
(
Min_PRB_Policy_Ratio
->
ran_param_id
==
Min_PRB_Policy_Ratio_8_4_3_6
&&
"wrong Min_PRB_Policy_Ratio id"
);
assert
(
Dedicated_PRB_Policy_Ratio
->
ran_param_val
.
type
==
ELEMENT_KEY_FLAG_FALSE_RAN_PARAMETER_VAL_TYPE
&&
"wrong Dedicated_PRB_Policy_Ratio type"
);
assert
(
Min_PRB_Policy_Ratio
->
ran_param_val
.
type
==
ELEMENT_KEY_FLAG_FALSE_RAN_PARAMETER_VAL_TYPE
&&
"wrong Min_PRB_Policy_Ratio type"
);
assert
(
Dedicated_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
!=
NULL
&&
"NULL Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false"
);
assert
(
Min_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
!=
NULL
&&
"NULL Min_PRB_Policy_Ratio->ran_param_val.flag_false"
);
assert
(
Dedicated_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
->
type
==
INTEGER_RAN_PARAMETER_VALUE
&&
"wrong Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false type"
);
assert
(
Min_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
->
type
==
INTEGER_RAN_PARAMETER_VALUE
&&
"wrong Min_PRB_Policy_Ratio->ran_param_val.flag_false type"
);
int64_t
nvs_cap
=
Dedicated_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
->
int_ran
;
int64_t
nvs_cap
=
Min_PRB_Policy_Ratio
->
ran_param_val
.
flag_false
->
int_ran
;
LOG_I
(
NR_MAC
,
"configure slice %ld, label %s, Dedicated_PRB_Policy_Ratio %ld
\n
"
,
i
,
label_nssai
,
nvs_cap
);
LOG_I
(
NR_MAC
,
"configure slice %ld, label %s, Min_PRB_Policy_Ratio %ld
\n
"
,
i
,
label_nssai
,
nvs_cap
);
// TODO: could be extended to support max prb ratio and dedicated prb ratio in the MAC scheduling algorithm
//seq_ran_param_t* Dedicated_PRB_Policy_Ratio = &RRM_Policy_Ratio_Group->ran_param_struct.ran_param_struct[3];
//assert(Dedicated_PRB_Policy_Ratio->ran_param_id == Dedicated_PRB_Policy_Ratio_8_4_3_6 && "wrong Dedicated_PRB_Policy_Ratio id");
//assert(Dedicated_PRB_Policy_Ratio->ran_param_val.type == ELEMENT_KEY_FLAG_FALSE_RAN_PARAMETER_VAL_TYPE && "wrong Dedicated_PRB_Policy_Ratio type");
//assert(Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false != NULL && "NULL Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false");
//assert(Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false->type == INTEGER_RAN_PARAMETER_VALUE && "wrong Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false type");
//int64_t dedicated_prb_ratio = Dedicated_PRB_Policy_Ratio->ran_param_val.flag_false->int_ran;
//LOG_I(NR_MAC, "configure slice %ld, label %s, Dedicated_PRB_Policy_Ratio %ld\n", i, label_nssai, dedicated_prb_ratio);
//seq_ran_param_t* Max_PRB_Policy_Ratio = &RRM_Policy_Ratio_Group->ran_param_struct.ran_param_struct[2];
//assert(Max_PRB_Policy_Ratio->ran_param_id == Max_PRB_Policy_Ratio_8_4_3_6 && "wrong Max_PRB_Policy_Ratio id");
//assert(Max_PRB_Policy_Ratio->ran_param_val.type == ELEMENT_KEY_FLAG_FALSE_RAN_PARAMETER_VAL_TYPE && "wrong Max_PRB_Policy_Ratio type");
//assert(Max_PRB_Policy_Ratio->ran_param_val.flag_false != NULL && "NULL Max_PRB_Policy_Ratio->ran_param_val.flag_false");
//assert(Max_PRB_Policy_Ratio->ran_param_val.flag_false->type == INTEGER_RAN_PARAMETER_VALUE && "wrong Max_PRB_Policy_Ratio->ran_param_val.flag_false type");
//int64_t max_prb_ratio = Max_PRB_Policy_Ratio->ran_param_val.flag_false->int_ran;
//LOG_I(NR_MAC, "configure slice %ld, label %s, Max_PRB_Policy_Ratio %ld\n", i, label_nssai, max_prb_ratio);
///// ADD SLICE /////
///// ADD SLICE /////
const
int
rc
=
add_mod_dl_slice
(
mod_id
,
current_algo
,
i
,
RC_sst
,
RC_sd
,
label_nssai
,
(
float
)
nvs_cap
);
const
int
rc
=
add_mod_dl_slice
(
mod_id
,
current_algo
,
i
,
RC_sst
,
RC_sd
,
label_nssai
,
(
float
)
nvs_cap
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment