Skip to content

O
OpenXG-RAN
Commit 963b8cc2 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Merge remote-tracking branch 'origin/itti-add-event-fix' into integration_2022_wk36b

parents bbab65f0 18b3189d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
common/utils/ocp_itti/intertask_interface.cpp
View file @ 963b8cc2
...@@ -276,16 +276,12 @@ extern "C" { ...@@ -276,16 +276,12 @@ extern "C" {
struct epoll_event events[t->nb_fd_epoll]; struct epoll_event events[t->nb_fd_epoll];
// Weird condition to deal with crap legacy itti interface // Weird condition to deal with crap legacy itti interface
if ( t->nb_fd_epoll == 1 ) { if (t->message_queue.empty()) {
while (t->message_queue.empty()) { do {
itti_get_events_locked(task_id, events, t->nb_fd_epoll);
pthread_mutex_lock(&t->queue_cond_lock);
}
} else {
if (t->message_queue.empty()) {
itti_get_events_locked(task_id, events, t->nb_fd_epoll); itti_get_events_locked(task_id, events, t->nb_fd_epoll);
pthread_mutex_lock(&t->queue_cond_lock); pthread_mutex_lock(&t->queue_cond_lock);
} }
while (t->message_queue.empty() && t->nb_fd_epoll == 1);
} }
// Legacy design: we return even if we have no message // Legacy design: we return even if we have no message
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment