From b501feae1894d5f5c4a939f9a62246fed618a9e9 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Fri, 21 Nov 2014 17:02:09 +0000
Subject: [PATCH] remove option before kernel 2.6.30
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6080 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
common/utils/itti/intertask_interface.c | 34 --------------------
common/utils/itti/intertask_interface_dump.c | 11 -------
2 files changed, 45 deletions(-)
diff --git a/common/utils/itti/intertask_interface.c b/common/utils/itti/intertask_interface.c
index e73fa8a04f..a8858eed1d 100644
--- a/common/utils/itti/intertask_interface.c
+++ b/common/utils/itti/intertask_interface.c
@@ -98,10 +98,6 @@ const int itti_debug = ITTI_DEBUG_ISSUES | ITTI_DEBUG_MP_STATISTICS;
/* Global message size */
#define MESSAGE_SIZE(mESSAGEiD) (sizeof(MessageHeader) + itti_desc.messages_info[mESSAGEiD].size)
-#ifndef EFD_SEMAPHORE
-# define KERNEL_VERSION_PRE_2_6_30 1
-#endif
-
#ifdef RTAI
# define ITTI_MEM_PAGE_SIZE (1024)
# define ITTI_MEM_SIZE (16 * 1024 * 1024)
@@ -135,9 +131,6 @@ typedef struct thread_desc_s {
/* Number of events to monitor */
uint16_t nb_events;
-#if defined(KERNEL_VERSION_PRE_2_6_30)
- eventfd_t sem_counter;
-#endif
/* Array of events monitored by the task.
* By default only one fd is monitored (the one used to received messages
@@ -634,10 +627,6 @@ static inline void itti_receive_msg_internal_event_fd(task_id_t task_id, uint8_t
read_ret = read (itti_desc.threads[thread_id].task_event_fd, &sem_counter, sizeof(sem_counter));
AssertFatal (read_ret == sizeof(sem_counter), "Read from task message FD (%d) failed (%d/%d)!\n", thread_id, (int) read_ret, (int) sizeof(sem_counter));
-#if defined(KERNEL_VERSION_PRE_2_6_30)
- /* Store the value of the semaphore counter */
- itti_desc.threads[task_id].sem_counter = sem_counter - 1;
-#endif
if (lfds611_queue_dequeue (itti_desc.tasks[task_id].message_queue, (void **) &message) == 0) {
/* No element in list -> this should not happen */
@@ -662,22 +651,6 @@ void itti_receive_msg(task_id_t task_id, MessageDef **received_msg)
__sync_and_and_fetch (&itti_desc.vcd_receive_msg, ~(1L << task_id)));
#endif
-#if defined(KERNEL_VERSION_PRE_2_6_30)
- /* Store the value of the semaphore counter */
- if (itti_desc.threads[task_id].sem_counter > 0) {
- struct message_list_s *message = NULL;
-
- if (lfds611_queue_dequeue (itti_desc.tasks[task_id].message_queue, (void **) &message) == 0) {
- /* No element in list -> this should not happen */
- DevParam(task_id, itti_desc.threads[task_id].sem_counter, 0);
- }
- DevAssert(message != NULL);
- *received_msg = message->msg;
- itti_free (ITTI_MSG_ORIGIN_ID(*received_msg), message);
-
- itti_desc.threads[task_id].sem_counter--;
- } else
-#endif
itti_receive_msg_internal_event_fd(task_id, 0, received_msg);
#if defined(OAI_EMU) || defined(RTAI)
@@ -923,14 +896,7 @@ int itti_init(task_id_t task_max, thread_id_t thread_max, MessagesIds messages_i
AssertFatal (0, "Failed to create new epoll fd: %s!\n", strerror(errno));
}
-# if defined(KERNEL_VERSION_PRE_2_6_30)
- /* SR: for kernel versions < 2.6.30 EFD_SEMAPHORE is not defined.
- * A read operation on the event fd will return the 8 byte value.
- */
- itti_desc.threads[thread_id].task_event_fd = eventfd(0, 0);
-# else
itti_desc.threads[thread_id].task_event_fd = eventfd(0, EFD_SEMAPHORE);
-# endif
if (itti_desc.threads[thread_id].task_event_fd == -1)
{
/* Always assert on this condition */
diff --git a/common/utils/itti/intertask_interface_dump.c b/common/utils/itti/intertask_interface_dump.c
index ce179e009b..4c4905db9f 100644
--- a/common/utils/itti/intertask_interface_dump.c
+++ b/common/utils/itti/intertask_interface_dump.c
@@ -75,9 +75,6 @@ static const int itti_dump_debug = 0; // 0x8 | 0x4 | 0x2;
#define ITTI_DUMP_ERROR(x, args...) do { fprintf(stdout, "[ITTI_DUMP][E]"x, ##args); } \
while(0)
-#ifndef EFD_SEMAPHORE
-# define KERNEL_VERSION_PRE_2_6_30 1
-#endif
typedef struct itti_dump_queue_item_s {
MessageDef *data;
@@ -620,11 +617,7 @@ static void *itti_dump_socket(void *arg_p)
pthread_exit(NULL);
}
AssertFatal (read_ret == sizeof(sem_counter), "Failed to read from dump event FD (%d/%d)!\n", (int) read_ret, (int) sizeof(sem_counter));
-#if defined(KERNEL_VERSION_PRE_2_6_30)
- if (itti_dump_flush_ring_buffer(1) == 0)
-#else
if (itti_dump_flush_ring_buffer(0) == 0)
-#endif
{
if (itti_dump_running)
{
@@ -818,11 +811,7 @@ int itti_dump_init(const char * const messages_definition_xml, const char * cons
#ifdef RTAI
itti_dump_queue.messages_in_queue = 0;
#else
-# if defined(KERNEL_VERSION_PRE_2_6_30)
- itti_dump_queue.event_fd = eventfd(0, 0);
-# else
itti_dump_queue.event_fd = eventfd(0, EFD_SEMAPHORE);
-# endif
if (itti_dump_queue.event_fd == -1) {
/* Always assert on this condition */
AssertFatal (0, "eventfd failed: %s!\n", strerror(errno));
--
GitLab