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
littleBu
OpenXG-RAN
Commits
f3e60a14
Commit
f3e60a14
authored
Oct 08, 2024
by
Bartosz Podrygajlo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use UL actor for processSlotTx
Use UL actor instead of Thread pool for processSlotTX.
parent
5bd2eb86
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
18 deletions
+10
-18
executables/nr-ue.c
executables/nr-ue.c
+8
-15
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+1
-0
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+1
-3
No files found.
executables/nr-ue.c
View file @
f3e60a14
...
...
@@ -103,10 +103,9 @@
static
void
*
NRUE_phy_stub_standalone_pnf_task
(
void
*
arg
);
static
void
start_process_slot_tx
(
void
*
arg
)
{
task_t
task
;
task
.
args
=
arg
;
task
.
func
=
processSlotTX
;
pushTpool
(
&
(
get_nrUE_params
()
->
Tpool
),
task
);
notifiedFIFO_elt_t
*
newTx
=
arg
;
nr_rxtx_thread_data_t
*
curMsgTx
=
NotifiedFifoData
(
newTx
);
pushNotifiedFIFO
(
&
curMsgTx
->
UE
->
ul_actor
.
fifo
,
newTx
);
}
static
size_t
dump_L1_UE_meas_stats
(
PHY_VARS_NR_UE
*
ue
,
char
*
output
,
size_t
max_len
)
...
...
@@ -563,13 +562,7 @@ void processSlotTX(void *arg)
phy_procedures_nrUE_TX
(
UE
,
proc
,
&
phy_data
);
}
}
int
slots_per_frame
=
(
UE
->
sl_mode
==
2
)
?
UE
->
SL_UE_PHY_PARAMS
.
sl_frame_params
.
slots_per_frame
:
UE
->
frame_parms
.
slots_per_frame
;
int
next_slot_and_frame
=
proc
->
nr_slot_tx
+
1
+
proc
->
nr_slot_tx_offset
+
proc
->
frame_tx
*
slots_per_frame
;
dynamic_barrier_join
(
&
UE
->
process_slot_tx_barriers
[
next_slot_and_frame
%
NUM_PROCESS_SLOT_TX_BARRIERS
]);
RU_write
(
rxtxD
,
sl_tx_action
);
free
(
rxtxD
);
TracyCZoneEnd
(
ctx
);
}
...
...
@@ -1082,22 +1075,22 @@ void *UE_thread(void *arg)
// Start TX slot processing here. It runs in parallel with RX slot processing
// in current code, DURATION_RX_TO_TX constant is the limit to get UL data to encode from a RX slot
nr_rxtx_thread_data_t
*
curMsgTx
=
calloc
(
1
,
sizeof
(
*
curMsgTx
));
notifiedFIFO_elt_t
*
newTx
=
newNotifiedFIFO_elt
(
sizeof
(
nr_rxtx_thread_data_t
),
0
,
0
,
processSlotTX
);
nr_rxtx_thread_data_t
*
curMsgTx
=
NotifiedFifoData
(
newTx
);
memset
(
curMsgTx
,
0
,
sizeof
(
*
curMsgTx
));
curMsgTx
->
proc
=
curMsg
.
proc
;
curMsgTx
->
writeBlockSize
=
writeBlockSize
;
curMsgTx
->
proc
.
timestamp_tx
=
writeTimestamp
;
curMsgTx
->
UE
=
UE
;
curMsgTx
->
stream_status
=
stream_status
;
curMsgTx
->
proc
.
nr_slot_tx_offset
=
nr_slot_tx_offset
;
int
sync_to_previous_thread
=
stream_status
==
STREAM_STATUS_SYNCED
?
1
:
0
;
int
slot
=
curMsgTx
->
proc
.
nr_slot_tx
;
int
slot_and_frame
=
slot
+
curMsgTx
->
proc
.
frame_tx
*
UE
->
frame_parms
.
slots_per_frame
;
dynamic_barrier_update
(
&
UE
->
process_slot_tx_barriers
[
slot_and_frame
%
NUM_PROCESS_SLOT_TX_BARRIERS
],
tx_wait_for_dlsch
[
slot
]
+
sync_to_previous_thread
,
tx_wait_for_dlsch
[
slot
],
start_process_slot_tx
,
curMsg
Tx
);
new
Tx
);
stream_status
=
STREAM_STATUS_SYNCED
;
tx_wait_for_dlsch
[
slot
]
=
0
;
// apply new duration next run to avoid thread dead lock
...
...
executables/nr-uesoftmodem.c
View file @
f3e60a14
...
...
@@ -497,6 +497,7 @@ int main(int argc, char **argv)
for
(
int
i
=
0
;
i
<
NUM_DL_ACTORS
;
i
++
)
{
init_actor
(
&
UE
[
CC_id
]
->
dl_actors
[
i
],
"DL_"
,
-
1
);
}
init_actor
(
&
UE
[
CC_id
]
->
ul_actor
,
"UL_"
,
-
1
);
init_nr_ue_vars
(
UE
[
CC_id
],
inst
);
if
(
UE
[
CC_id
]
->
sl_mode
)
{
...
...
openair1/PHY/defs_nr_UE.h
View file @
f3e60a14
...
...
@@ -548,9 +548,8 @@ typedef struct PHY_VARS_NR_UE_s {
sl_nr_ue_phy_params_t
SL_UE_PHY_PARAMS
;
Actor_t
sync_actor
;
Actor_t
dl_actors
[
NUM_DL_ACTORS
];
Actor_t
ul_actor
;
ntn_config_message_t
*
ntn_config_message
;
}
PHY_VARS_NR_UE
;
typedef
struct
{
...
...
@@ -632,7 +631,6 @@ typedef struct nr_rxtx_thread_data_s {
nr_phy_data_t
phy_data
;
int
tx_wait_for_dlsch
;
int
rx_offset
;
enum
stream_status_e
stream_status
;
}
nr_rxtx_thread_data_t
;
typedef
struct
LDPCDecode_ue_s
{
...
...
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