From e42dd369679f05bc39f66ffd61c020eb8d52de06 Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Fri, 1 Jan 2016 20:05:15 +0100
Subject: [PATCH] update the itti timer
---
common/utils/itti/timer.c | 6 +++++-
maketags | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/utils/itti/timer.c b/common/utils/itti/timer.c
index 40e87910227..864ab167467 100644
--- a/common/utils/itti/timer.c
+++ b/common/utils/itti/timer.c
@@ -96,6 +96,8 @@ int timer_handle_signal(siginfo_t *info)
// LG: To many traces for msc timer:
// TMR_DEBUG("Timer with id 0x%lx has expired\n", (long)timer_p->timer);
+#if defined(ENABLE_ITTI)
+
task_id = timer_p->task_id;
instance = timer_p->instance;
message_p = itti_alloc_new_message(TASK_TIMER, TIMER_HAS_EXPIRED);
@@ -104,6 +106,7 @@ int timer_handle_signal(siginfo_t *info)
timer_expired_p->timer_id = (long)timer_p->timer;
timer_expired_p->arg = timer_p->timer_arg;
+#endif
/* Timer is a one shot timer, remove it */
if (timer_p->type == TIMER_ONE_SHOT) {
@@ -120,13 +123,14 @@ int timer_handle_signal(siginfo_t *info)
TMR_DEBUG("Failed to delete timer 0x%lx\n", (long)timer_p->timer);
}
}
-
+#ifdefined ENABLE_ITTI
/* Notify task of timer expiry */
if (itti_send_msg_to_task(task_id, instance, message_p) < 0) {
TMR_DEBUG("Failed to send msg TIMER_HAS_EXPIRED to task %u\n", task_id);
free(message_p);
return -1;
}
+#endif
return 0;
}
diff --git a/maketags b/maketags
index ec283c8bec6..53bc1c12d00 100755
--- a/maketags
+++ b/maketags
@@ -1,3 +1,3 @@
#!/bin/sh
echo "building ctags for openair1 and openair2 ..."
-ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair2/RRC/CELLULAR/ --exclude=openair2/NAS/DRIVER/CELLULAR/ --exclude=openair2/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 targets
+ctags -e -R --exclude=openair1/DOCS/ --exclude=openair2/DOCS/ --exclude=openair2/RRC/CELLULAR/ --exclude=openair2/NAS/DRIVER/CELLULAR/ --exclude=openair2/SIMULATION/ --exclude=targets/DOCS/ --exclude=targets/PROJECTS/ openair1 openair2 openair3 targets common
--
GitLab