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
Michael Black
OpenXG-RAN
Commits
21983a20
Commit
21983a20
authored
Jun 23, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Patch fairRR scheduler to use slice iface of pre-processor
parent
08b122e3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+8
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
21983a20
...
@@ -542,6 +542,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
...
@@ -542,6 +542,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
uint16_t
temp_total_rbs_count
;
uint16_t
temp_total_rbs_count
;
unsigned
char
temp_total_ue_count
;
unsigned
char
temp_total_ue_count
;
unsigned
char
MIMO_mode_indicator
[
MAX_NUM_CCs
][
N_RBG_MAX
];
unsigned
char
MIMO_mode_indicator
[
MAX_NUM_CCs
][
N_RBG_MAX
];
uint8_t
slice_allocation
[
MAX_NUM_CCs
][
N_RBG_MAX
];
int
UE_id
,
i
;
int
UE_id
,
i
;
uint16_t
j
;
uint16_t
j
;
uint16_t
nb_rbs_required
[
MAX_NUM_CCs
][
NUMBER_OF_UE_MAX
];
uint16_t
nb_rbs_required
[
MAX_NUM_CCs
][
NUMBER_OF_UE_MAX
];
...
@@ -660,17 +661,22 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
...
@@ -660,17 +661,22 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
transmission_mode
=
get_tmode
(
Mod_id
,
CC_id
,
UE_id
);
transmission_mode
=
get_tmode
(
Mod_id
,
CC_id
,
UE_id
);
/* slicing support has been introduced into the scheduler. Provide dummy
* data so that the preprocessor "simply works" */
for
(
int
i
=
0
;
i
<
MAX_NUM_CCs
;
++
i
)
for
(
int
j
=
0
;
i
<
N_RBG_MAX
;
++
j
)
slice_allocation
[
i
][
j
]
=
1
;
LOG_T
(
MAC
,
"calling dlsch_scheduler_pre_processor_allocate ..
\n
"
);
LOG_T
(
MAC
,
"calling dlsch_scheduler_pre_processor_allocate ..
\n
"
);
dlsch_scheduler_pre_processor_allocate
(
Mod_id
,
dlsch_scheduler_pre_processor_allocate
(
Mod_id
,
UE_id
,
UE_id
,
CC_id
,
CC_id
,
N_RBG
[
CC_id
],
N_RBG
[
CC_id
],
transmission_mode
,
min_rb_unit
[
CC_id
],
min_rb_unit
[
CC_id
],
N_RB_DL
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required_remaining
,
(
uint16_t
(
*
)[
NUMBER_OF_UE_MAX
])
nb_rbs_required_remaining
,
rballoc_sub
,
rballoc_sub
,
slice_allocation
,
MIMO_mode_indicator
);
MIMO_mode_indicator
);
temp_total_rbs_count
-=
ue_sched_ctl
->
pre_nb_available_rbs
[
CC_id
];
temp_total_rbs_count
-=
ue_sched_ctl
->
pre_nb_available_rbs
[
CC_id
];
temp_total_ue_count
--
;
temp_total_ue_count
--
;
...
...
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