Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
eea4b34a
Commit
eea4b34a
authored
Aug 27, 2018
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: fairRR scheduler allocates Resource Block only to one UE when multiple UEs are selected.
parent
d8a6d2d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+12
-11
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
eea4b34a
...
@@ -787,13 +787,11 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -787,13 +787,11 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
// unsigned char aggregation;
// unsigned char aggregation;
mac_rlc_status_resp_t
rlc_status
;
mac_rlc_status_resp_t
rlc_status
;
unsigned
char
header_len_dcch
=
0
,
header_len_dcch_tmp
=
0
;
unsigned
char
header_len_dcch
=
0
,
header_len_dcch_tmp
=
0
;
unsigned
char
header_len_dtch
=
0
,
header_len_dtch_tmp
=
unsigned
char
header_len_dtch
=
0
,
header_len_dtch_tmp
=
0
,
header_len_dtch_last
=
0
;
0
,
header_len_dtch_last
=
0
;
unsigned
char
ta_len
=
0
;
unsigned
char
ta_len
=
0
;
unsigned
char
sdu_lcids
[
NB_RB_MAX
],
lcid
,
offset
,
num_sdus
=
0
;
unsigned
char
sdu_lcids
[
NB_RB_MAX
],
lcid
,
offset
,
num_sdus
=
0
;
uint16_t
nb_rb
,
nb_rb_temp
,
nb_available_rb
;
uint16_t
nb_rb
,
nb_rb_temp
,
nb_available_rb
;
uint16_t
TBS
,
j
,
sdu_lengths
[
NB_RB_MAX
],
rnti
,
padding
=
uint16_t
TBS
,
j
,
sdu_lengths
[
NB_RB_MAX
],
rnti
,
padding
=
0
,
post_padding
=
0
;
0
,
post_padding
=
0
;
unsigned
char
dlsch_buffer
[
MAX_DLSCH_PAYLOAD_BYTES
];
unsigned
char
dlsch_buffer
[
MAX_DLSCH_PAYLOAD_BYTES
];
unsigned
char
round
=
0
;
unsigned
char
round
=
0
;
unsigned
char
harq_pid
=
0
;
unsigned
char
harq_pid
=
0
;
...
@@ -818,7 +816,10 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -818,7 +816,10 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
;
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
;
int
tdd_sfa
;
int
tdd_sfa
;
int
ta_update
;
int
ta_update
;
#ifdef DEBUG_eNB_SCHEDULER
int
k
;
#endif
start_meas
(
&
eNB
->
schedule_dlsch
);
start_meas
(
&
eNB
->
schedule_dlsch
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH
,
VCD_FUNCTION_IN
);
(
VCD_SIGNAL_DUMPER_FUNCTIONS_SCHEDULE_DLSCH
,
VCD_FUNCTION_IN
);
...
@@ -1335,8 +1336,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -1335,8 +1336,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
"[eNB %d][DCCH] CC_id %d Got %d bytes :"
,
"[eNB %d][DCCH] CC_id %d Got %d bytes :"
,
module_idP
,
CC_id
,
sdu_lengths
[
0
]);
module_idP
,
CC_id
,
sdu_lengths
[
0
]);
for
(
j
=
0
;
j
<
sdu_lengths
[
0
];
j
++
)
{
for
(
k
=
0
;
k
<
sdu_lengths
[
0
];
k
++
)
{
LOG_T
(
MAC
,
"%x "
,
dlsch_buffer
[
j
]);
LOG_T
(
MAC
,
"%x "
,
dlsch_buffer
[
k
]);
}
}
LOG_T
(
MAC
,
"
\n
"
);
LOG_T
(
MAC
,
"
\n
"
);
...
@@ -1389,8 +1390,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -1389,8 +1390,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
"[eNB %d][DCCH1] CC_id %d Got %d bytes :"
,
"[eNB %d][DCCH1] CC_id %d Got %d bytes :"
,
module_idP
,
CC_id
,
sdu_lengths
[
num_sdus
]);
module_idP
,
CC_id
,
sdu_lengths
[
num_sdus
]);
for
(
j
=
0
;
j
<
sdu_lengths
[
num_sdus
];
j
++
)
{
for
(
k
=
0
;
k
<
sdu_lengths
[
num_sdus
];
k
++
)
{
LOG_T
(
MAC
,
"%x "
,
dlsch_buffer
[
j
]);
LOG_T
(
MAC
,
"%x "
,
dlsch_buffer
[
k
]);
}
}
LOG_T
(
MAC
,
"
\n
"
);
LOG_T
(
MAC
,
"
\n
"
);
...
@@ -1638,8 +1639,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
...
@@ -1638,8 +1639,8 @@ schedule_ue_spec_fairRR(module_id_t module_idP,
#ifdef DEBUG_eNB_SCHEDULER
#ifdef DEBUG_eNB_SCHEDULER
LOG_T
(
MAC
,
"[eNB %d] First 16 bytes of DLSCH :
\n
"
,
module_idP
);
LOG_T
(
MAC
,
"[eNB %d] First 16 bytes of DLSCH :
\n
"
,
module_idP
);
for
(
i
=
0
;
i
<
16
;
i
++
)
{
for
(
k
=
0
;
k
<
16
;
k
++
)
{
LOG_T
(
MAC
,
"%x."
,
dlsch_buffer
[
i
]);
LOG_T
(
MAC
,
"%x."
,
dlsch_buffer
[
k
]);
}
}
LOG_T
(
MAC
,
"
\n
"
);
LOG_T
(
MAC
,
"
\n
"
);
...
...
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