diff --git a/common/utils/itti/intertask_interface.c b/common/utils/itti/intertask_interface.c index 7aa62a935b364cf4998eca35268e79e56c833783..5aec9cc2ec1d16f22b921a1f8abf94666a0d13dd 100644 --- a/common/utils/itti/intertask_interface.c +++ b/common/utils/itti/intertask_interface.c @@ -402,14 +402,16 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t epoll_timeout = -1; } - epoll_ret = epoll_wait(itti_desc.tasks[thread_id].epoll_fd, - itti_desc.tasks[thread_id].events, - itti_desc.tasks[thread_id].nb_events, - epoll_timeout); + do { + epoll_ret = epoll_wait(itti_desc.tasks[thread_id].epoll_fd, + itti_desc.tasks[thread_id].events, + itti_desc.tasks[thread_id].nb_events, + epoll_timeout); + } while (epoll_ret < 0 && errno == EINTR); if (epoll_ret < 0) { ITTI_ERROR("epoll_wait failed for task %s: %s\n", - itti_get_task_name(task_id), strerror(errno)); + itti_get_task_name(task_id), strerror(errno)); DevAssert(0 == 1); } if (epoll_ret == 0 && polling) { diff --git a/common/utils/itti_analyzer/libresolver/resolvers.c b/common/utils/itti_analyzer/libresolver/resolvers.c index 2fc2392ae0cfe891e35cd45c8d90f053e3e52aec..a0e0104deb632cc55768acc14f051a0f1a2899b4 100644 --- a/common/utils/itti_analyzer/libresolver/resolvers.c +++ b/common/utils/itti_analyzer/libresolver/resolvers.c @@ -101,7 +101,7 @@ int resolve_struct(types_t **head) if (next_type->type != TYPE_STRUCT) continue; -// printf("Trying to resolve struct members %s with type %d\n", next_type->name, next_type->id); +// g_debug("Trying to resolve struct members %s with type %d", next_type->name, next_type->id); /* Struct may have no member */ if (next_type->members == NULL) @@ -135,7 +135,8 @@ int resolve_struct(types_t **head) /* Pick up the next string available */ member = strtok(NULL, " _"); } -// next_type->type_hr_display(next_type, 0); + + free(members); } return 0; @@ -185,7 +186,8 @@ int resolve_union(types_t **head) /* Pick up the next string available */ member = strtok(NULL, " _"); } -// next_type->type_hr_display(next_type, 0); + + free(members); } return 0;