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
ao gleen
OpenXG-RAN
Commits
b257734c
Commit
b257734c
authored
Oct 27, 2023
by
Laurent THOMAS
Committed by
Robert Schmidt
Oct 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tPool calls: symmetric to pushing messages
Messages are pushed using pushNotifiedFIFO(), so we pullNotifiedFIFO()
parent
9a57514b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
executables/nr-gnb.c
executables/nr-gnb.c
+6
-8
nfapi/oai_integration/nfapi_pnf.c
nfapi/oai_integration/nfapi_pnf.c
+1
-1
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/fapi_nr_l1.c
+1
-1
No files found.
executables/nr-gnb.c
View file @
b257734c
...
...
@@ -290,7 +290,7 @@ void rx_func(void *param)
pushTpool
(
&
gNB
->
threadPool
,
res
);
}
}
else
if
(
get_softmodem_params
()
->
continuous_tx
)
{
notifiedFIFO_elt_t
*
res
=
pull
Tpool
(
&
gNB
->
L1_tx_free
,
&
gNB
->
threadPool
);
notifiedFIFO_elt_t
*
res
=
pull
NotifiedFIFO
(
&
gNB
->
L1_tx_free
);
if
(
res
==
NULL
)
return
;
// Tpool has been stopped
processingData_L1tx_t
*
syncMsg
=
(
processingData_L1tx_t
*
)
NotifiedFifoData
(
res
);
...
...
@@ -420,10 +420,8 @@ void *nrL1_stats_thread(void *param) {
// two parallel L1 tx threads.
void
*
tx_reorder_thread
(
void
*
param
)
{
PHY_VARS_gNB
*
gNB
=
(
PHY_VARS_gNB
*
)
param
;
notifiedFIFO_elt_t
*
resL1Reserve
=
NULL
;
resL1Reserve
=
pullTpool
(
&
gNB
->
L1_tx_out
,
&
gNB
->
threadPool
);
notifiedFIFO_elt_t
*
resL1Reserve
=
pullNotifiedFIFO
(
&
gNB
->
L1_tx_out
);
AssertFatal
(
resL1Reserve
!=
NULL
,
"pullTpool() did not return start message in %s
\n
"
,
__func__
);
int
next_tx_slot
=
((
processingData_L1tx_t
*
)
NotifiedFifoData
(
resL1Reserve
))
->
slot
;
...
...
@@ -436,15 +434,15 @@ void *tx_reorder_thread(void* param) {
if
(((
processingData_L1tx_t
*
)
NotifiedFifoData
(
resL1
))
->
slot
!=
next_tx_slot
)
{
LOG_E
(
PHY
,
"order mistake
\n
"
);
resL1Reserve
=
NULL
;
resL1
=
pull
Tpool
(
&
gNB
->
L1_tx_out
,
&
gNB
->
threadPool
);
resL1
=
pull
NotifiedFIFO
(
&
gNB
->
L1_tx_out
);
}
}
else
{
resL1
=
pull
Tpool
(
&
gNB
->
L1_tx_out
,
&
gNB
->
threadPool
);
}
else
{
resL1
=
pull
NotifiedFIFO
(
&
gNB
->
L1_tx_out
);
if
(
resL1
!=
NULL
&&
((
processingData_L1tx_t
*
)
NotifiedFifoData
(
resL1
))
->
slot
!=
next_tx_slot
)
{
if
(
resL1Reserve
)
LOG_E
(
PHY
,
"error, have a stored packet, then a second one
\n
"
);
resL1Reserve
=
resL1
;
resL1
=
pull
Tpool
(
&
gNB
->
L1_tx_out
,
&
gNB
->
threadPool
);
resL1
=
pull
NotifiedFIFO
(
&
gNB
->
L1_tx_out
);
if
(((
processingData_L1tx_t
*
)
NotifiedFifoData
(
resL1
))
->
slot
!=
next_tx_slot
)
LOG_E
(
PHY
,
"error, pull two msg, none is good
\n
"
);
}
...
...
nfapi/oai_integration/nfapi_pnf.c
View file @
b257734c
...
...
@@ -1112,7 +1112,7 @@ notifiedFIFO_elt_t *l1tx_message_extract(PHY_VARS_gNB *gNB, int frame, int slot)
notifiedFIFO_elt_t
*
res
;
//TODO: This needs to be reworked for nfapi to work
res
=
pull
Tpool
(
&
gNB
->
L1_tx_free
,
&
gNB
->
threadPool
);
res
=
pull
NotifiedFIFO
(
&
gNB
->
L1_tx_free
);
return
res
;
}
...
...
openair1/SCHED_NR/fapi_nr_l1.c
View file @
b257734c
...
...
@@ -161,7 +161,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
notifiedFIFO_elt_t
*
res
=
NULL
;
processingData_L1tx_t
*
msgTx
=
NULL
;
if
(
!
gNB
->
reorder_thread_disable
)
{
res
=
pullTpool
(
&
gNB
->
L1_tx_free
,
&
gNB
->
threadPool
);
res
=
pullNotifiedFIFO
(
&
gNB
->
L1_tx_free
);
if
(
res
==
NULL
)
return
;
// Tpool has been stopped, nothing to process
msgTx
=
(
processingData_L1tx_t
*
)
NotifiedFifoData
(
res
);
...
...
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