X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Ftime_support.h;h=7abbdb24d21778c0b14d2b2c36c4c80ee045e46d;hb=5b263d7b0c71d2560af5dabbeec051b807d9e6a3;hp=d8b7fe5ca6e95aae357f8d704037d15067f5f494;hpb=8b4e882a1630d63bbc9840fa3f968e36b6ac3702;p=openocd.git

diff --git a/src/helper/time_support.h b/src/helper/time_support.h
index d8b7fe5ca6..7abbdb24d2 100644
--- a/src/helper/time_support.h
+++ b/src/helper/time_support.h
@@ -2,6 +2,12 @@
  *   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     *
@@ -13,18 +19,43 @@
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef TIME_SUPPORT_H
-#define TIME_SUPPORT_H
 
-#include <sys/time.h>
-#include <time.h>
+#ifndef OPENOCD_HELPER_TIME_SUPPORT_H
+#define OPENOCD_HELPER_TIME_SUPPORT_H
+
+#ifdef TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
+int timeval_add_time(struct timeval *result, long sec, long usec);
+int timeval_compare(const struct timeval *x, const struct timeval *y);
+
+/** @returns gettimeofday() timeval as 64-bit in ms */
+int64_t timeval_ms(void);
+
+struct duration {
+	struct timeval start;
+	struct timeval elapsed;
+};
+
+/** Update the duration->start field to start the @a duration measurement. */
+int duration_start(struct duration *duration);
+/** Update the duration->elapsed field to finish the @a duration measurment. */
+int duration_measure(struct duration *duration);
 
-extern int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-extern int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
-extern int timeval_add_time(struct timeval *result, int sec, int usec);
+/** @returns Elapsed time in seconds. */
+float duration_elapsed(const struct duration *duration);
+/** @returns KB/sec for the elapsed @a duration and @a count bytes. */
+float duration_kbps(const struct duration *duration, size_t count);
 
-#endif /* TIME_SUPPORT_H */
+#endif /* OPENOCD_HELPER_TIME_SUPPORT_H */