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
canghaiwuhen
OpenXG-RAN
Commits
e8faf0c6
Commit
e8faf0c6
authored
Nov 09, 2020
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix dl scheduler in fairRR mode
parent
fbbf80d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+2
-1
No files found.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
e8faf0c6
...
@@ -1173,6 +1173,6 @@ void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subfram
...
@@ -1173,6 +1173,6 @@ void update_ue_timers(module_id_t module_idP,frame_t frameP, sub_frame_t subfram
}
// end RB_FOREACH
}
// end RB_FOREACH
select_ul_ue_candidate
(
module_idP
,
frameP
,
subframeP
);
//
select_ul_ue_candidate( module_idP, frameP, subframeP);
select_dl_ue_candidate
(
module_idP
,
frameP
,
subframeP
);
//
select_dl_ue_candidate( module_idP, frameP, subframeP);
}
}
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
e8faf0c6
...
@@ -1439,7 +1439,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
...
@@ -1439,7 +1439,7 @@ void dlsch_scheduler_pre_processor_fairRR (module_id_t Mod_id,
}
}
}
}
}
}
select_dl_ue_candidate
(
Mod_id
,
frameP
,
subframeP
);
dlsch_scheduler_pre_ue_select_fairRR
(
Mod_id
,
frameP
,
subframeP
,
mbsfn_flag
,
nb_rbs_required
,
dlsch_ue_select
);
dlsch_scheduler_pre_ue_select_fairRR
(
Mod_id
,
frameP
,
subframeP
,
mbsfn_flag
,
nb_rbs_required
,
dlsch_ue_select
);
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
average_rbs_per_user
[
CC_id
]
=
0
;
average_rbs_per_user
[
CC_id
]
=
0
;
...
@@ -4238,6 +4238,7 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
...
@@ -4238,6 +4238,7 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
COMMON_channels_t
*
cc
;
COMMON_channels_t
*
cc
;
LOG_D
(
MAC
,
"In ulsch_preprocessor: ulsch ue select
\n
"
);
LOG_D
(
MAC
,
"In ulsch_preprocessor: ulsch ue select
\n
"
);
//ue select
//ue select
select_ul_ue_candidate
(
module_idP
,
frameP
,
subframeP
);
ulsch_scheduler_pre_ue_select_fairRR
(
module_idP
,
frameP
,
subframeP
,
sched_subframeP
,
ulsch_ue_select
);
ulsch_scheduler_pre_ue_select_fairRR
(
module_idP
,
frameP
,
subframeP
,
sched_subframeP
,
ulsch_ue_select
);
// MCS and RB assgin
// MCS and RB assgin
...
...
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