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
c308414c
Commit
c308414c
authored
Apr 16, 2023
by
Danil Ruban
Committed by
Jerome PERALDI
Apr 17, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugz #124647 annoying VTP messages fix
parent
6c59bcf3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
12 deletions
+15
-12
executables/lte-enb.c
executables/lte-enb.c
+13
-10
openair3/SS/ss_eNB_vtp_task.c
openair3/SS/ss_eNB_vtp_task.c
+2
-2
No files found.
executables/lte-enb.c
View file @
c308414c
...
@@ -275,19 +275,22 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
...
@@ -275,19 +275,22 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
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
(
RC
.
ss
.
vtp_ready
)
if
(
message_p_vt_timer
)
{
{
SS_UPD_TIM_INFO
(
message_p_vt_timer
).
sf
=
eNB
->
UL_INFO
.
subframe
;
MessageDef
*
message_p_vt_timer
=
itti_alloc_new_message
(
TASK_ENB_APP
,
0
,
SS_UPD_TIM_INFO
);
SS_UPD_TIM_INFO
(
message_p_vt_timer
).
sfn
=
eNB
->
UL_INFO
.
frame
;
if
(
message_p_vt_timer
)
int
send_res
=
itti_send_msg_to_task
(
TASK_VT_TIMER
,
0
,
message_p_vt_timer
);
if
(
send_res
<
0
)
{
{
printf
(
"Error in itti_send_msg_to_task"
);
SS_UPD_TIM_INFO
(
message_p_vt_timer
).
sf
=
eNB
->
UL_INFO
.
subframe
;
// LOG_E( PHY, "[SS] Error in L1_Thread itti_send_msg_to_task"); /** TODO: Need separate logging for SS */
SS_UPD_TIM_INFO
(
message_p_vt_timer
).
sfn
=
eNB
->
UL_INFO
.
frame
;
int
send_res
=
itti_send_msg_to_task
(
TASK_VT_TIMER
,
0
,
message_p_vt_timer
);
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 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 */
}
}
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
)
{
if
(
eNB
->
UL_INFO
.
subframe
==
0
)
{
...
...
openair3/SS/ss_eNB_vtp_task.c
View file @
c308414c
...
@@ -270,6 +270,7 @@ static inline void ss_eNB_read_from_vtp_socket(acpCtx_t ctx, bool vtInit)
...
@@ -270,6 +270,7 @@ static inline void ss_eNB_read_from_vtp_socket(acpCtx_t ctx, bool vtInit)
if
(
isConnected
==
false
||
vtInit
==
true
)
if
(
isConnected
==
false
||
vtInit
==
true
)
{
{
// No message (timeout on socket)
// No message (timeout on socket)
RC
.
ss
.
vtp_ready
=
0
;
break
;
break
;
}
}
...
@@ -362,7 +363,6 @@ void *ss_eNB_vtp_process_itti_msg(void *notUsed)
...
@@ -362,7 +363,6 @@ void *ss_eNB_vtp_process_itti_msg(void *notUsed)
}
}
ss_eNB_read_from_vtp_socket
(
ctx_vtp_g
,
false
);
ss_eNB_read_from_vtp_socket
(
ctx_vtp_g
,
false
);
return
NULL
;
return
NULL
;
}
}
...
@@ -421,6 +421,7 @@ static void ss_eNB_wait_first_msg(void)
...
@@ -421,6 +421,7 @@ static void ss_eNB_wait_first_msg(void)
ss_eNB_read_from_vtp_socket
(
ctx_vtp_g
,
true
);
ss_eNB_read_from_vtp_socket
(
ctx_vtp_g
,
true
);
if
(
isConnected
==
true
){
if
(
isConnected
==
true
){
LOG_A
(
ENB_APP
,
"[SS_VTP] VT-HANDSHAKE with Client Completed (on-start)
\n
"
);
LOG_A
(
ENB_APP
,
"[SS_VTP] VT-HANDSHAKE with Client Completed (on-start)
\n
"
);
RC
.
ss
.
vtp_ready
=
1
;
break
;
break
;
}
}
LOG_A
(
ENB_APP
,
"[SS_VTP] Waiting for VT-HANDSHAKE with Client(on-start)
\n
"
);
LOG_A
(
ENB_APP
,
"[SS_VTP] Waiting for VT-HANDSHAKE with Client(on-start)
\n
"
);
...
@@ -439,7 +440,6 @@ void* ss_eNB_vtp_task(void *arg) {
...
@@ -439,7 +440,6 @@ void* ss_eNB_vtp_task(void *arg) {
ss_eNB_wait_first_msg
();
ss_eNB_wait_first_msg
();
RC
.
ss
.
vtp_ready
=
1
;
ss_enable_vtp
();
ss_enable_vtp
();
sleep
(
1
);
sleep
(
1
);
while
(
1
)
{
while
(
1
)
{
...
...
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