ecos: crisper implementation of timeval_ms()

A crisper/faster implementation under eCos that makes profiling a
tad easier.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 244ada7cd80564500d46e7ed04712c1bb4ad4377..3ec4f31a0672ca0ae6a7f7c3e7fba48db33e6267 100644 (file)
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -7,9 +7,9 @@ METASOURCES = AUTO
 noinst_LTLIBRARIES = libhelper.la
 
 if ECOSBOARD
-CONFIGFILES =
+CONFIGFILES = time_support_ecos.c
 else
-CONFIGFILES = options.c jim.c jim-eventloop.c
+CONFIGFILES = options.c jim.c jim-eventloop.c time_support_common.c
 endif
 
 

diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index 693528fe1954c1398cd6967b50be061caa9948c5..19343157c96a806d05cdbcb2379d1966a39c07e8 100644 (file)
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -29,7 +29,6 @@
 
 #include "time_support.h"
 
-
 /* calculate difference between two struct timeval values */
 int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
 {
@@ -73,16 +72,6 @@ int timeval_add_time(struct timeval *result, long sec, long usec)
        return 0;
 }
 
-int64_t timeval_ms()
-{
-       struct timeval now;
-       int retval = gettimeofday(&now, NULL);
-       if (retval < 0)
-               return retval;
-       return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000;
-}
-
-
 int duration_start(struct duration *duration)
 {
        return gettimeofday(&duration->start, NULL);

diff --git a/src/helper/time_support_common.c b/src/helper/time_support_common.c
new file mode 100644 (file)
index 0000000..1ad3676
--- /dev/null
+++ b/src/helper/time_support_common.c
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "time_support.h"
+
+/* simple and low overhead fetching of ms counter. Use only
+ * the difference between ms counters returned from this fn.
+ */
+int64_t timeval_ms()
+{
+       struct timeval now;
+       int retval = gettimeofday(&now, NULL);
+       if (retval < 0)
+               return retval;
+       return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000;
+}

diff --git a/src/helper/time_support_ecos.c b/src/helper/time_support_ecos.c
new file mode 100644 (file)
index 0000000..b0911fc
--- /dev/null
+++ b/src/helper/time_support_ecos.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *   Copyright (C) 2006 by Dominic Rath                                    *
+ *   Dominic.Rath@gmx.de                                                   *
+ *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "time_support.h"
+
+#include <cyg/kernel/kapi.h>
+
+int64_t timeval_ms()
+{
+       /* Faster/less noisy implementation of getting ms when
+        * profiling
+        */
+       static const int ms_per_tick =
+                       (CYGNUM_HAL_RTC_NUMERATOR / CYGNUM_HAL_RTC_DENOMINATOR) / 1000000;
+       cyg_tick_count_t cur_time = cyg_current_time();
+       return ((int)cur_time) * ms_per_tick;
+}