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
Michael Black
OpenXG-RAN
Commits
6f862c0d
Commit
6f862c0d
authored
Sep 02, 2022
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a bug in itti external sockets
parent
bf2b069d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
common/utils/ocp_itti/intertask_interface.cpp
common/utils/ocp_itti/intertask_interface.cpp
+6
-4
No files found.
common/utils/ocp_itti/intertask_interface.cpp
View file @
6f862c0d
...
...
@@ -181,10 +181,10 @@ extern "C" {
t
->
nb_fd_epoll
--
;
}
static
inline
int
itti_get_events_locked
(
task_id_t
task_id
,
struct
epoll_event
*
events
,
int
nb
_events
)
{
static
inline
int
itti_get_events_locked
(
task_id_t
task_id
,
struct
epoll_event
*
events
,
int
max
_events
)
{
task_list_t
*
t
=
tasks
[
task_id
];
uint64_t
current_time
=
0
;
int
nb_events
;
do
{
if
(
t
->
next_timer
!=
UINT64_MAX
)
{
struct
timespec
tp
;
...
...
@@ -230,7 +230,7 @@ extern "C" {
pthread_mutex_unlock
(
&
t
->
queue_cond_lock
);
LOG_D
(
ITTI
,
"enter blocking wait for %s, timeout: %d ms
\n
"
,
itti_get_task_name
(
task_id
),
epoll_timeout
);
nb_events
=
epoll_wait
(
t
->
epoll_fd
,
events
,
t
->
nb_fd_epoll
,
epoll_timeout
);
nb_events
=
epoll_wait
(
t
->
epoll_fd
,
events
,
max_events
,
epoll_timeout
);
if
(
nb_events
<
0
&&
(
errno
==
EINTR
||
errno
==
EAGAIN
)
)
pthread_mutex_lock
(
&
t
->
queue_cond_lock
);
...
...
@@ -238,7 +238,9 @@ extern "C" {
AssertFatal
(
nb_events
>=
0
,
"epoll_wait failed for task %s, nb fds %d, timeout %lu: %s!
\n
"
,
itti_get_task_name
(
task_id
),
t
->
nb_fd_epoll
,
t
->
next_timer
!=
UINT64_MAX
?
t
->
next_timer
-
current_time
:
-
1
,
strerror
(
errno
));
itti_get_task_name
(
task_id
),
t
->
nb_fd_epoll
,
t
->
next_timer
!=
UINT64_MAX
?
t
->
next_timer
-
current_time
:
-
1
,
strerror
(
errno
));
LOG_D
(
ITTI
,
"receive on %d descriptors for %s
\n
"
,
nb_events
,
itti_get_task_name
(
task_id
));
if
(
nb_events
==
0
)
...
...
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