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
spbro
OpenXG-RAN
Commits
a748262e
Commit
a748262e
authored
Jan 11, 2019
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove some debug before merge develop
parent
a2ef8b7b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+14
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
a748262e
...
@@ -134,6 +134,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -134,6 +134,7 @@ rx_sdu(const module_id_t enb_mod_idP,
memset
(
rx_lengths
,
0
,
NB_RB_MAX
*
sizeof
(
unsigned
short
));
memset
(
rx_lengths
,
0
,
NB_RB_MAX
*
sizeof
(
unsigned
short
));
// LAD
// LAD
/*
if (UE_id == -1) {
if (UE_id == -1) {
LOG_E(MAC, "Step 1\n");
LOG_E(MAC, "Step 1\n");
LOG_W(MAC, "[MAC] UE_id = -1 ; RNTI = %x ; frame = %d ; subframe = %d ; sdu_length = %d ; sdu = %d\n",
LOG_W(MAC, "[MAC] UE_id = -1 ; RNTI = %x ; frame = %d ; subframe = %d ; sdu_length = %d ; sdu = %d\n",
...
@@ -143,6 +144,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -143,6 +144,7 @@ rx_sdu(const module_id_t enb_mod_idP,
sdu_lenP,
sdu_lenP,
*sduP);
*sduP);
}
}
*/
start_meas
(
&
mac
->
rx_ulsch_sdu
);
start_meas
(
&
mac
->
rx_ulsch_sdu
);
...
@@ -195,11 +197,13 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -195,11 +197,13 @@ rx_sdu(const module_id_t enb_mod_idP,
/* update bytes to schedule */
/* update bytes to schedule */
// LAD
// LAD
/*
LOG_E(MAC, "Step 2\n");
LOG_E(MAC, "Step 2\n");
LOG_W(MAC, "[MAC] UE_id != -1 and sduP != NULL : first_rb = %d ; scheduled_ul_bytes = %d ; TBS_UL = %d\n",
LOG_W(MAC, "[MAC] UE_id != -1 and sduP != NULL : first_rb = %d ; scheduled_ul_bytes = %d ; TBS_UL = %d\n",
first_rb,
first_rb,
UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes,
UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes,
UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid]);
UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid]);
*/
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
scheduled_ul_bytes
-=
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
TBS_UL
[
harq_pid
];
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
scheduled_ul_bytes
-=
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
TBS_UL
[
harq_pid
];
...
@@ -295,11 +299,13 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -295,11 +299,13 @@ rx_sdu(const module_id_t enb_mod_idP,
first_rb
=
ra
[
RA_id
].
msg3_first_rb
;
first_rb
=
ra
[
RA_id
].
msg3_first_rb
;
// LAD
// LAD
/*
LOG_E(MAC, "Step 3\n");
LOG_E(MAC, "Step 3\n");
LOG_W(MAC, "[MAC] UE_id == -1 : first_rb = %d ; scheduled_ul_bytes = %d ; TBS_UL = %d\n",
LOG_W(MAC, "[MAC] UE_id == -1 : first_rb = %d ; scheduled_ul_bytes = %d ; TBS_UL = %d\n",
first_rb,
first_rb,
UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes,
UE_list->UE_template[CC_idP][UE_id].scheduled_ul_bytes,
UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid]);
UE_list->UE_template[CC_idP][UE_id].TBS_UL[harq_pid]);
*/
if
(
sduP
==
NULL
)
{
// we've got an error on Msg3
if
(
sduP
==
NULL
)
{
// we've got an error on Msg3
LOG_W
(
MAC
,
"[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d
\n
"
,
LOG_W
(
MAC
,
"[eNB %d] CC_id %d, RA %d ULSCH in error in round %d/%d
\n
"
,
...
@@ -316,6 +322,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -316,6 +322,7 @@ rx_sdu(const module_id_t enb_mod_idP,
ra
[
RA_id
].
msg3_round
++
;
ra
[
RA_id
].
msg3_round
++
;
// LAD
// LAD
/*
LOG_E(MAC, "Step 4\n");
LOG_E(MAC, "Step 4\n");
LOG_W(MAC, "[MAC] [UEINFO1] UE_id = %d ; RNTI_ue_template = %x ; RNTI_sdu = %x\n",
LOG_W(MAC, "[MAC] [UEINFO1] UE_id = %d ; RNTI_ue_template = %x ; RNTI_sdu = %x\n",
UE_id,
UE_id,
...
@@ -332,6 +339,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -332,6 +339,7 @@ rx_sdu(const module_id_t enb_mod_idP,
LOG_W(MAC, "[MAC] [RAPROC] msg3_subframe = %d ; msg3_frame = %d\n",
LOG_W(MAC, "[MAC] [RAPROC] msg3_subframe = %d ; msg3_frame = %d\n",
ra[RA_id].Msg3_subframe,
ra[RA_id].Msg3_subframe,
ra[RA_id].Msg3_frame);
ra[RA_id].Msg3_frame);
*/
/* Prepare handling of retransmission */
/* Prepare handling of retransmission */
get_Msg3allocret
(
&
mac
->
common_channels
[
CC_idP
],
get_Msg3allocret
(
&
mac
->
common_channels
[
CC_idP
],
...
@@ -341,9 +349,11 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -341,9 +349,11 @@ rx_sdu(const module_id_t enb_mod_idP,
&
ra
[
RA_id
].
Msg3_subframe
);
&
ra
[
RA_id
].
Msg3_subframe
);
// LAD
// LAD
/*
LOG_W(MAC, "[MAC] [RAPROC] After update: msg3_subframe = %d ; msg3_frame = %d\n",
LOG_W(MAC, "[MAC] [RAPROC] After update: msg3_subframe = %d ; msg3_frame = %d\n",
ra[RA_id].Msg3_subframe,
ra[RA_id].Msg3_subframe,
ra[RA_id].Msg3_frame);
ra[RA_id].Msg3_frame);
*/
add_msg3
(
enb_mod_idP
,
CC_idP
,
&
ra
[
RA_id
],
frameP
,
subframeP
);
add_msg3
(
enb_mod_idP
,
CC_idP
,
&
ra
[
RA_id
],
frameP
,
subframeP
);
}
}
...
@@ -399,6 +409,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -399,6 +409,7 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_list
->
UE_sched_ctrl
[
UE_id
].
round_UL
[
CC_idP
][
harq_pid
]
=
0
;
// can UE_id = -1 !?
UE_list
->
UE_sched_ctrl
[
UE_id
].
round_UL
[
CC_idP
][
harq_pid
]
=
0
;
// can UE_id = -1 !?
// LAD
// LAD
/*
LOG_E(MAC, "Step 5\n");
LOG_E(MAC, "Step 5\n");
LOG_W(MAC, "[MAC] [UEINFO2] UE_id = %d ; RNTI_ue_template = %x ; RNTI_sdu = %x ; frame = %d ; subframe = %d\n",
LOG_W(MAC, "[MAC] [UEINFO2] UE_id = %d ; RNTI_ue_template = %x ; RNTI_sdu = %x ; frame = %d ; subframe = %d\n",
UE_id,
UE_id,
...
@@ -406,6 +417,7 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -406,6 +417,7 @@ rx_sdu(const module_id_t enb_mod_idP,
current_rnti,
current_rnti,
frameP,
frameP,
subframeP);
subframeP);
*/
/* Control element */
/* Control element */
for
(
int
i
=
0
;
i
<
num_ce
;
i
++
)
{
for
(
int
i
=
0
;
i
<
num_ce
;
i
++
)
{
...
...
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