Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-946-gc8b8a34
|
From: Øyvind H. <go...@us...> - 2009-12-16 11:26:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via c8b8a34bb5e98660c4ce3683fb64af31b494d55c (commit)
from 74ce435d97ca4f6f81645d755d04123f075aa42b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8b8a34bb5e98660c4ce3683fb64af31b494d55c
Author: Ãyvind Harboe <oyv...@zy...>
Date: Tue Dec 15 14:57:38 2009 +0100
ecos: crisper implementation of timeval_ms()
A crisper/faster implementation under eCos that makes profiling a
tad easier.
Signed-off-by: Ãyvind Harboe <oyv...@zy...>
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 244ada7..3ec4f31 100644
--- 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 693528f..1934315 100644
--- 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
index 0000000..1ad3676
--- /dev/null
+++ b/src/helper/time_support_common.c
@@ -0,0 +1,42 @@
+/***************************************************************************
+ * Copyright (C) 2006 by Dominic Rath *
+ * Dom...@gm... *
+ * *
+ * Copyright (C) 2007,2008 Ãyvind Harboe *
+ * oyv...@zy... *
+ * *
+ * Copyright (C) 2008 by Spencer Oliver *
+ * sp...@sp... *
+ * *
+ * 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
index 0000000..b0911fc
--- /dev/null
+++ b/src/helper/time_support_ecos.c
@@ -0,0 +1,43 @@
+/***************************************************************************
+ * Copyright (C) 2006 by Dominic Rath *
+ * Dom...@gm... *
+ * *
+ * Copyright (C) 2007,2008 Ãyvind Harboe *
+ * oyv...@zy... *
+ * *
+ * Copyright (C) 2008 by Spencer Oliver *
+ * sp...@sp... *
+ * *
+ * 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;
+}
-----------------------------------------------------------------------
Summary of changes:
src/helper/Makefile.am | 4 +-
src/helper/time_support.c | 11 ------
.../gdb_server.h => helper/time_support_common.c} | 36 +++++++++-----------
.../gdb_server.h => helper/time_support_ecos.c} | 35 +++++++++----------
4 files changed, 34 insertions(+), 52 deletions(-)
copy src/{server/gdb_server.h => helper/time_support_common.c} (76%)
copy src/{server/gdb_server.h => helper/time_support_ecos.c} (76%)
hooks/post-receive
--
Main OpenOCD repository
|
