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
wangjie
OpenXG-RAN
Commits
66726e86
Commit
66726e86
authored
Jan 09, 2021
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't log retransmissions explicitly
parent
0ae71881
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+4
-4
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+2
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
66726e86
...
@@ -394,7 +394,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
...
@@ -394,7 +394,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
m
,
m
,
nr_of_candidates
);
nr_of_candidates
);
if
(
sched_ctrl
->
cce_index
<
0
)
{
if
(
sched_ctrl
->
cce_index
<
0
)
{
LOG_
E
(
MAC
,
"%s(): could not find CCE for UE %d
\n
"
,
__func__
,
UE_id
);
LOG_
D
(
MAC
,
"%s(): could not find CCE for UE %d
\n
"
,
__func__
,
UE_id
);
return
;
return
;
}
}
UE_info
->
num_pdcch_cand
[
UE_id
][
cid
]
++
;
UE_info
->
num_pdcch_cand
[
UE_id
][
cid
]
++
;
...
@@ -403,7 +403,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
...
@@ -403,7 +403,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
* allocation after CCE alloc fail would be more complex) */
* allocation after CCE alloc fail would be more complex) */
const
bool
alloc
=
nr_acknack_scheduling
(
module_id
,
UE_id
,
frame
,
slot
);
const
bool
alloc
=
nr_acknack_scheduling
(
module_id
,
UE_id
,
frame
,
slot
);
if
(
!
alloc
)
{
if
(
!
alloc
)
{
LOG_
W
(
MAC
,
LOG_
D
(
MAC
,
"%s(): could not find PUCCH for UE %d/%04x@%d.%d
\n
"
,
"%s(): could not find PUCCH for UE %d/%04x@%d.%d
\n
"
,
__func__
,
__func__
,
UE_id
,
UE_id
,
...
@@ -433,7 +433,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
...
@@ -433,7 +433,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
rbSize
=
0
;
rbSize
=
0
;
while
(
rbStart
<
bwpSize
&&
vrb_map
[
rbStart
])
rbStart
++
;
while
(
rbStart
<
bwpSize
&&
vrb_map
[
rbStart
])
rbStart
++
;
if
(
rbStart
>=
bwpSize
)
{
if
(
rbStart
>=
bwpSize
)
{
LOG_
E
(
MAC
,
LOG_
D
(
MAC
,
"%4d.%2d cannot allocate retransmission for UE %d/RNTI %04x: no resources
\n
"
,
"%4d.%2d cannot allocate retransmission for UE %d/RNTI %04x: no resources
\n
"
,
frame
,
frame
,
slot
,
slot
,
...
@@ -816,7 +816,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -816,7 +816,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
retInfo
->
numDmrsCdmGrpsNoData
);
retInfo
->
numDmrsCdmGrpsNoData
);
/* we do not have to do anything, since we do not require to get data
/* we do not have to do anything, since we do not require to get data
* from RLC or encode MAC CEs. The TX_req structure is filled below */
* from RLC or encode MAC CEs. The TX_req structure is filled below */
LOG_
W
(
MAC
,
LOG_
D
(
MAC
,
"%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d
\n
"
,
"%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d
\n
"
,
frame
,
frame
,
slot
,
slot
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
66726e86
...
@@ -503,7 +503,7 @@ void nr_simple_ulsch_preprocessor(module_id_t module_id,
...
@@ -503,7 +503,7 @@ void nr_simple_ulsch_preprocessor(module_id_t module_id,
m
,
m
,
nr_of_candidates
);
nr_of_candidates
);
if
(
sched_ctrl
->
cce_index
<
0
)
{
if
(
sched_ctrl
->
cce_index
<
0
)
{
LOG_
E
(
MAC
,
"%s(): CCE list not empty, couldn't schedule PUSCH
\n
"
,
__func__
);
LOG_
D
(
MAC
,
"%s(): CCE list not empty, couldn't schedule PUSCH
\n
"
,
__func__
);
return
;
return
;
}
}
UE_info
->
num_pdcch_cand
[
UE_id
][
cid
]
++
;
UE_info
->
num_pdcch_cand
[
UE_id
][
cid
]
++
;
...
@@ -621,7 +621,7 @@ void nr_schedule_ulsch(module_id_t module_id,
...
@@ -621,7 +621,7 @@ void nr_schedule_ulsch(module_id_t module_id,
if
(
cur_harq
->
round
==
0
)
{
if
(
cur_harq
->
round
==
0
)
{
UE_info
->
mac_stats
[
UE_id
].
ulsch_total_bytes_scheduled
+=
sched_pusch
->
tb_size
;
UE_info
->
mac_stats
[
UE_id
].
ulsch_total_bytes_scheduled
+=
sched_pusch
->
tb_size
;
}
else
{
}
else
{
LOG_
W
(
MAC
,
LOG_
D
(
MAC
,
"%d.%2d UL retransmission RNTI %04x sched %d.%2d HARQ PID %d round %d NDI %d
\n
"
,
"%d.%2d UL retransmission RNTI %04x sched %d.%2d HARQ PID %d round %d NDI %d
\n
"
,
frame
,
frame
,
slot
,
slot
,
...
...
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