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
aa8810bf
Commit
aa8810bf
authored
Jun 06, 2023
by
mir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cancellation added
parent
356da54c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+8
-0
openair1/PHY/defs_gNB.h
openair1/PHY/defs_gNB.h
+3
-0
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+4
-4
No files found.
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
View file @
aa8810bf
...
...
@@ -155,6 +155,12 @@ NR_gNB_ULSCH_t new_gNB_ulsch(uint8_t max_ldpc_iterations, uint16_t N_RB_UL)
void
nr_processULSegment
(
void
*
arg
)
{
ldpcDecode_t
*
rdata
=
(
ldpcDecode_t
*
)
arg
;
#ifdef TASK_MANAGER
if
(
*
rdata
->
cancel
==
true
);
return
;
#endif
PHY_VARS_gNB
*
phy_vars_gNB
=
rdata
->
gNB
;
NR_UL_gNB_HARQ_t
*
ulsch_harq
=
rdata
->
ulsch_harq
;
t_nrLDPC_dec_params
*
p_decoderParms
=
&
rdata
->
decoderParms
;
...
...
@@ -610,6 +616,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
#ifdef TASK_MANAGER
ldpcDecode_t
*
arr
=
calloc
(
harq_process
->
C
,
sizeof
(
ldpcDecode_t
));
_Atomic
bool
cancel
=
false
;
int
idx_arr
=
0
;
#endif
...
...
@@ -617,6 +624,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
int
E
=
nr_get_E
(
G
,
harq_process
->
C
,
Qm
,
n_layers
,
r
);
#ifdef TASK_MANAGER
ldpcDecode_t
*
rdata
=
&
arr
[
idx_arr
];
rdata
->
cancel
=
&
cancel
;
++
idx_arr
;
#else
union
ldpcReqUnion
id
=
{.
s
=
{
ulsch
->
rnti
,
frame
,
nr_tti_rx
,
0
,
0
}};
...
...
openair1/PHY/defs_gNB.h
View file @
aa8810bf
...
...
@@ -810,6 +810,9 @@ typedef struct LDPCDecode_s {
int
offset
;
int
decodeIterations
;
uint32_t
tbslbrm
;
#ifdef TASK_MANAGER
_Atomic
bool
*
cancel
;
#endif
}
ldpcDecode_t
;
struct
ldpcReqId
{
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
aa8810bf
...
...
@@ -262,11 +262,11 @@ void nr_postDecode(PHY_VARS_gNB *gNB, notifiedFIFO_elt_t *req)
rdata
->
Kr_bytes
-
(
ulsch_harq
->
F
>>
3
)
-
((
ulsch_harq
->
C
>
1
)
?
3
:
0
));
}
else
{
if
(
rdata
->
nbSegments
!=
ulsch_harq
->
processedSegments
)
{
// Let's forget about this optimization for now
if
(
rdata
->
nbSegments
!=
ulsch_harq
->
processedSegments
)
{
#ifdef TASK_MANAGER
printf
(
"openair1/SCHED_NR/phy_procedures_nr_gNB.c:267
\n
"
);
assert
(
0
!=
0
)
;
#
ifndef TASK_MANAGER
*
rdata
->
cancel
=
true
;
#
else
int
nb
=
abortTpoolJob
(
&
gNB
->
threadPool
,
req
->
key
);
nb
+=
abortNotifiedFIFOJob
(
&
gNB
->
respDecode
,
req
->
key
);
gNB
->
nbDecode
-=
nb
;
...
...
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