maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Schmidt
2022-09-08 20:43:15 +02:00
parent bbab65f09c 18b3189d4e
commit 963b8cc2ee
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/ocp_itti/intertask_interface.cpp
+3 -7
View File
@@ -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