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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
1b69fc6c
Commit
1b69fc6c
authored
Aug 28, 2023
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix incorrect usage of time_meas() that is not thread safe API
parent
e74b9a5c
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
136 additions
and
71 deletions
+136
-71
common/utils/telnetsrv/telnetsrv_cpumeasur_def.h
common/utils/telnetsrv/telnetsrv_cpumeasur_def.h
+0
-2
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+131
-63
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+0
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+5
-4
No files found.
common/utils/telnetsrv/telnetsrv_cpumeasur_def.h
View file @
1b69fc6c
...
@@ -110,8 +110,6 @@
...
@@ -110,8 +110,6 @@
{"ulsch_ldpc_encoding_stats", &(UE->ulsch_ldpc_encoding_stats),0,1},\
{"ulsch_ldpc_encoding_stats", &(UE->ulsch_ldpc_encoding_stats),0,1},\
{"ulsch_interleaving_stats", &(UE->ulsch_interleaving_stats),0,1},\
{"ulsch_interleaving_stats", &(UE->ulsch_interleaving_stats),0,1},\
{"ulsch_multiplexing_stats", &(UE->ulsch_multiplexing_stats),0,1},\
{"ulsch_multiplexing_stats", &(UE->ulsch_multiplexing_stats),0,1},\
{"generic_stat", &(UE->generic_stat),0,1},\
{"generic_stat_bis", &(UE->generic_stat_bis[0]),0,LTE_SLOTS_PER_SUBFRAME},\
{"ofdm_demod_stats", &(UE->ofdm_demod_stats),0,1},\
{"ofdm_demod_stats", &(UE->ofdm_demod_stats),0,1},\
{"dlsch_rx_pdcch_stats", &(UE->dlsch_rx_pdcch_stats),0,1},\
{"dlsch_rx_pdcch_stats", &(UE->dlsch_rx_pdcch_stats),0,1},\
{"rx_dft_stats", &(UE->rx_dft_stats),0,1},\
{"rx_dft_stats", &(UE->rx_dft_stats),0,1},\
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
1b69fc6c
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_nr_UE.h
View file @
1b69fc6c
...
@@ -592,8 +592,6 @@ typedef struct {
...
@@ -592,8 +592,6 @@ typedef struct {
time_stats_t
ulsch_interleaving_stats
;
time_stats_t
ulsch_interleaving_stats
;
time_stats_t
ulsch_multiplexing_stats
;
time_stats_t
ulsch_multiplexing_stats
;
time_stats_t
generic_stat
;
time_stats_t
generic_stat_bis
[
LTE_SLOTS_PER_SUBFRAME
];
time_stats_t
ue_front_end_stat
;
time_stats_t
ue_front_end_stat
;
time_stats_t
ue_front_end_per_slot_stat
[
LTE_SLOTS_PER_SUBFRAME
];
time_stats_t
ue_front_end_per_slot_stat
[
LTE_SLOTS_PER_SUBFRAME
];
time_stats_t
pdcch_procedures_stat
;
time_stats_t
pdcch_procedures_stat
;
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
1b69fc6c
...
@@ -1019,7 +1019,8 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
...
@@ -1019,7 +1019,8 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
int
gNB_id
=
proc
->
gNB_id
;
int
gNB_id
=
proc
->
gNB_id
;
NR_UE_DLSCH_t
*
dlsch
=
&
phy_data
->
dlsch
[
0
];
NR_UE_DLSCH_t
*
dlsch
=
&
phy_data
->
dlsch
[
0
];
start_meas
(
&
ue
->
generic_stat
);
time_stats_t
meas
=
{
0
};
start_meas
(
&
meas
);
// do procedures for C-RNTI
// do procedures for C-RNTI
int
ret_pdsch
=
0
;
int
ret_pdsch
=
0
;
...
@@ -1131,7 +1132,7 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
...
@@ -1131,7 +1132,7 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
ue
->
csirs_vars
[
gNB_id
]
->
active
=
0
;
ue
->
csirs_vars
[
gNB_id
]
->
active
=
0
;
}
}
start_meas
(
&
ue
->
generic_stat
);
start_meas
(
&
meas
);
if
(
nr_slot_rx
==
9
)
{
if
(
nr_slot_rx
==
9
)
{
if
(
frame_rx
%
10
==
0
)
{
if
(
frame_rx
%
10
==
0
)
{
...
@@ -1157,9 +1158,9 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
...
@@ -1157,9 +1158,9 @@ void pdsch_processing(PHY_VARS_NR_UE *ue,
}
}
stop_meas
(
&
ue
->
generic_stat
);
stop_meas
(
&
meas
);
if
(
cpumeas
(
CPUMEAS_GETSTATE
))
if
(
cpumeas
(
CPUMEAS_GETSTATE
))
LOG_D
(
PHY
,
"after ldpc decode until end of Rx %5.2f
\n
"
,
ue
->
generic_stat
.
p_time
/
(
cpuf
*
1000
.
0
));
LOG_D
(
PHY
,
"after ldpc decode until end of Rx %5.2f
\n
"
,
meas
.
p_time
/
(
cpuf
*
1000
.
0
));
#ifdef EMOS
#ifdef EMOS
phy_procedures_emos_UE_RX
(
ue
,
slot
,
gNB_id
);
phy_procedures_emos_UE_RX
(
ue
,
slot
,
gNB_id
);
...
...
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