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
lizhongxiao
OpenXG-RAN
Commits
77d51086
Commit
77d51086
authored
Mar 16, 2023
by
Danil Ruban
Committed by
jperaldi
Mar 31, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
try to reduce vt message count
parent
abedec29
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
25 deletions
+28
-25
executables/lte-enb.c
executables/lte-enb.c
+28
-25
No files found.
executables/lte-enb.c
View file @
77d51086
...
...
@@ -274,21 +274,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
LOG_D
(
PHY
,
"[SS] SS_UPD_TIM_INFO from L1_Thread to SYS task itti_send_msg_to_task sfn %d sf %d"
,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
}
MessageDef
*
message_p_vtp
=
itti_alloc_new_message
(
TASK_ENB_APP
,
0
,
SS_UPD_TIM_INFO
);
if
(
message_p_vtp
&&
RC
.
ss
.
vtp_ready
)
{
SS_UPD_TIM_INFO
(
message_p_vtp
).
sf
=
eNB
->
UL_INFO
.
subframe
;
SS_UPD_TIM_INFO
(
message_p_vtp
).
sfn
=
eNB
->
UL_INFO
.
frame
;
SS_UPD_TIM_INFO
(
message_p_vtp
).
physCellId
=
RC
.
rrc
[
eNB
->
UL_INFO
.
module_id
]
->
carrier
[
eNB
->
UL_INFO
.
CC_id
].
physCellId
;
int
send_res
=
itti_send_msg_to_task
(
TASK_VTP
,
0
,
message_p_vtp
);
if
(
send_res
<
0
)
{
printf
(
"Error in itti_send_msg_to_task"
);
// LOG_E( PHY, "[SS] Error in L1_Thread itti_send_msg_to_task"); /** TODO: Need separate logging for SS */
}
LOG_D
(
PHY
,
"[SS] SS_UPD_TIM_INFO from L1_Thread to VTP task itti_send_msg_to_task sfn %d sf %d"
,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
}
MessageDef
*
message_p_vt_timer
=
itti_alloc_new_message
(
TASK_ENB_APP
,
0
,
SS_UPD_TIM_INFO
);
if
(
message_p_vt_timer
)
{
...
...
@@ -303,6 +289,24 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
LOG_D
(
PHY
,
"[SS] SS_UPD_TIM_INFO from L1_Thread to TASK_VT_TIMER task itti_send_msg_to_task sfn %d sf %d"
,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
}
if
(
eNB
->
UL_INFO
.
subframe
==
0
)
{
MessageDef
*
message_p_vtp
=
itti_alloc_new_message
(
TASK_ENB_APP
,
0
,
SS_UPD_TIM_INFO
);
if
(
message_p_vtp
&&
RC
.
ss
.
vtp_ready
)
{
SS_UPD_TIM_INFO
(
message_p_vtp
).
sf
=
eNB
->
UL_INFO
.
subframe
;
SS_UPD_TIM_INFO
(
message_p_vtp
).
sfn
=
eNB
->
UL_INFO
.
frame
;
SS_UPD_TIM_INFO
(
message_p_vtp
).
physCellId
=
RC
.
rrc
[
eNB
->
UL_INFO
.
module_id
]
->
carrier
[
eNB
->
UL_INFO
.
CC_id
].
physCellId
;
int
send_res
=
itti_send_msg_to_task
(
TASK_VTP
,
0
,
message_p_vtp
);
if
(
send_res
<
0
)
{
printf
(
"Error in itti_send_msg_to_task"
);
// LOG_E( PHY, "[SS] Error in L1_Thread itti_send_msg_to_task"); /** TODO: Need separate logging for SS */
}
LOG_D
(
PHY
,
"[SS] SS_UPD_TIM_INFO from L1_Thread to VTP task itti_send_msg_to_task sfn %d sf %d"
,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
}
}
}
int
tem_proc_ccid
=
proc
->
CC_id
;
...
...
@@ -527,11 +531,10 @@ void eNB_top(PHY_VARS_eNB *eNB,
L1_proc
->
timestamp_tx
=
ru_proc
->
timestamp_rx
+
(
ru
->
sf_ahead
*
fp
->
samples_per_tti
);
L1_proc
->
frame_rx
=
ru_proc
->
frame_rx
;
L1_proc
->
subframe_rx
=
ru_proc
->
tti_rx
;
L1_proc
->
frame_tx
=
(
L1_proc
->
subframe_rx
>
(
9
-
ru
->
sf_ahead
))
?
(
L1_proc
->
frame_rx
+
1
)
&
1023
:
L1_proc
->
frame_rx
;
L1_proc
->
subframe_tx
=
(
L1_proc
->
subframe_rx
+
ru
->
sf_ahead
)
%
10
;
L1_proc
->
frame_tx
=
(
L1_proc
->
subframe_rx
>
(
9
-
sf_ahead
))
?
(
L1_proc
->
frame_rx
+
1
)
&
1023
:
L1_proc
->
frame_rx
;
L1_proc
->
subframe_tx
=
(
L1_proc
->
subframe_rx
+
sf_ahead
)
%
10
;
if
(
rxtx
(
eNB
,
L1_proc
,
string
)
<
0
)
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
ru_proc
->
timestamp_tx
=
L1_proc
->
timestamp_tx
;
ru_proc
->
tti_tx
=
L1_proc
->
subframe_tx
;
ru_proc
->
frame_tx
=
L1_proc
->
frame_tx
;
...
...
@@ -615,7 +618,7 @@ int wakeup_tx(PHY_VARS_eNB *eNB,
int
ret
;
LOG_D
(
PHY
,
"ENTERED wakeup_tx (IC %d)
\n
"
,
L1_proc_tx
->
instance_cnt
);
// check if subframe is a has TX else return
if
(
subframe_select
(
&
eNB
->
frame_parms
,
subframe_tx
)
==
SF_UL
)
return
0
;
if
(
subframe_select
(
&
eNB
->
frame_parms
,
subframe_tx
)
==
SF_UL
)
return
0
;
AssertFatal
((
ret
=
pthread_mutex_lock
(
&
L1_proc_tx
->
mutex
))
==
0
,
"mutex_lock returns %d
\n
"
,
ret
);
LOG_D
(
PHY
,
"L1 RX %d.%d Waiting to wake up L1 TX %d.%d (IC L1TX %d)
\n
"
,
frame_rx
,
subframe_rx
,
frame_tx
,
subframe_tx
,
L1_proc_tx
->
instance_cnt
);
...
...
@@ -660,7 +663,7 @@ int wakeup_rxtx(PHY_VARS_eNB *eNB,
ru_proc->frame_rx,ru_proc->tti_rx,L1_proc->frame_rx,L1_proc->subframe_rx);
*/
return
(
0
);
}
++
L1_proc
->
instance_cnt
;
...
...
@@ -1212,7 +1215,7 @@ void init_transport(PHY_VARS_eNB *eNB) {
eNB
->
check_for_SUMIMO_transmissions
=
0
;
fp
->
pucch_config_common
.
deltaPUCCH_Shift
=
1
;
if
(
eNB
->
use_DTX
==
0
)
fill_subframe_mask
(
eNB
);
}
...
...
@@ -1230,9 +1233,9 @@ void init_eNB_afterRU(void) {
// map antennas and PRACH signals to eNB RX
LOG_I
(
PHY
,
"Mapping RX ports from %d RUs to eNB %d
\n
"
,
eNB
->
num_RU
,
eNB
->
Mod_id
);
eNB
->
frame_parms
.
nb_antennas_rx
=
0
;
LOG_I
(
PHY
,
"eNB->num_RU:%d
\n
"
,
eNB
->
num_RU
);
LOG_I
(
PHY
,
"eNB->num_RU:%d
\n
"
,
eNB
->
num_RU
);
if
(
NFAPI_MODE
==
NFAPI_MODE_PNF
)
AssertFatal
(
eNB
->
num_RU
>
0
,
"Number of RU attached to eNB %d is zero
\n
"
,
eNB
->
Mod_id
);
for
(
int
ru_id
=
0
;
ru_id
<
eNB
->
num_RU
;
ru_id
++
)
for
(
int
ru_id
=
0
;
ru_id
<
eNB
->
num_RU
;
ru_id
++
)
eNB
->
frame_parms
.
nb_antennas_rx
+=
eNB
->
RU_list
[
ru_id
]
->
nb_rx
;
phy_init_lte_eNB
(
eNB
,
0
,
0
);
LOG_I
(
PHY
,
"Overwriting eNB->prach_vars.rxsigF[0]:%p
\n
"
,
eNB
->
prach_vars
.
rxsigF
[
0
]);
...
...
@@ -1317,7 +1320,7 @@ void init_eNB(int single_thread_flag,
if
(
RC
.
eNB
[
inst
]
==
NULL
)
RC
.
eNB
[
inst
]
=
(
PHY_VARS_eNB
**
)
malloc
(
RC
.
nb_CC
[
inst
]
*
sizeof
(
PHY_VARS_eNB
*
));
for
(
CC_id
=
0
;
CC_id
<
RC
.
nb_L1_CC
[
inst
];
CC_id
++
)
{
if
(
RC
.
eNB
[
inst
][
CC_id
]
==
NULL
)
if
(
RC
.
eNB
[
inst
][
CC_id
]
==
NULL
)
RC
.
eNB
[
inst
][
CC_id
]
=
(
PHY_VARS_eNB
*
)
calloc
(
1
,
sizeof
(
PHY_VARS_eNB
));
eNB
=
RC
.
eNB
[
inst
][
CC_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