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
48d2f999
Commit
48d2f999
authored
Oct 02, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/improve-itti-log' into integration_2023_w39
parents
41ea99c5
dbdfe06d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
ci-scripts/cls_physim1.py
ci-scripts/cls_physim1.py
+1
-1
common/utils/ocp_itti/intertask_interface.cpp
common/utils/ocp_itti/intertask_interface.cpp
+18
-5
No files found.
ci-scripts/cls_physim1.py
View file @
48d2f999
...
@@ -161,7 +161,7 @@ class PhySim:
...
@@ -161,7 +161,7 @@ class PhySim:
isRunning
=
False
isRunning
=
False
count
=
0
count
=
0
# Check whether the containers are in Running state or not under 2 mins
# Check whether the containers are in Running state or not under 2 mins
while
(
count
<
2
and
isRunning
==
False
):
while
(
count
<
5
and
isRunning
==
False
):
time
.
sleep
(
60
)
time
.
sleep
(
60
)
mySSH
.
command
(
'oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt'
,
'\$'
,
30
,
resync
=
True
)
mySSH
.
command
(
'oc get pods -o wide -l app=physim | tee -a cmake_targets/log/physim_pods_summary.txt'
,
'\$'
,
30
,
resync
=
True
)
running_count
=
mySSH
.
getBefore
().
count
(
'Running'
)
running_count
=
mySSH
.
getBefore
().
count
(
'Running'
)
...
...
common/utils/ocp_itti/intertask_interface.cpp
View file @
48d2f999
...
@@ -49,6 +49,7 @@ extern "C" {
...
@@ -49,6 +49,7 @@ extern "C" {
int
nb_fd_epoll
=
0
;
int
nb_fd_epoll
=
0
;
int
epoll_fd
=-
1
;
int
epoll_fd
=-
1
;
int
sem_fd
=-
1
;
int
sem_fd
=-
1
;
size_t
last_log_size
=
0
;
}
task_list_t
;
}
task_list_t
;
int
timer_expired
(
int
fd
);
int
timer_expired
(
int
fd
);
...
@@ -131,11 +132,23 @@ extern "C" {
...
@@ -131,11 +132,23 @@ extern "C" {
int
message_id
=
message
->
ittiMsgHeader
.
messageId
;
int
message_id
=
message
->
ittiMsgHeader
.
messageId
;
size_t
s
=
t
->
message_queue
.
size
();
size_t
s
=
t
->
message_queue
.
size
();
if
(
s
>
t
->
admin
.
queue_size
)
// to reduce the number of logs, we give a message each increase of 25%
LOG_E
(
TMR
,
"Queue for %s task contains %ld messages
\n
"
,
itti_get_task_name
(
destination_task_id
),
s
);
if
((
s
>
t
->
last_log_size
*
1.25
)
&&
(
s
>
t
->
admin
.
queue_size
/
10
))
{
if
(
s
>
t
->
admin
.
queue_size
)
{
if
(
s
>
50
)
LOG_E
(
TMR
,
"Queue for %s task contains %ld messages
\n
"
,
itti_get_task_name
(
destination_task_id
),
s
);
LOG_I
(
ITTI
,
"Queue for %s task size: %ld (last message %s)
\n
"
,
itti_get_task_name
(
destination_task_id
),
s
+
1
,
ITTI_MSG_NAME
(
message
));
}
else
{
LOG_I
(
ITTI
,
"Queue for %s task size: %ld (last message %s)
\n
"
,
itti_get_task_name
(
destination_task_id
),
s
+
1
,
ITTI_MSG_NAME
(
message
));
}
t
->
last_log_size
=
s
;
}
else
if
(
t
->
last_log_size
&&
s
<
t
->
admin
.
queue_size
/
10
)
{
// Inform when the queue decreases
LOG_I
(
ITTI
,
"Queue for %s task size is back under 10%% of max size
\n
"
,
itti_get_task_name
(
destination_task_id
));
t
->
last_log_size
=
0
;
}
t
->
message_queue
.
insert
(
t
->
message_queue
.
begin
(),
message
);
t
->
message_queue
.
insert
(
t
->
message_queue
.
begin
(),
message
);
eventfd_t
sem_counter
=
1
;
eventfd_t
sem_counter
=
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