* 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 *
* 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 <sys/time.h>
-#include <time.h>
-
-int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
-int timeval_add_time(struct timeval *result, int sec, int usec);
-
/* calculate difference between two struct timeval values */
int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
{
- if (x->tv_usec < y->tv_usec)
- {
+ if (x->tv_usec < y->tv_usec) {
int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
y->tv_usec -= 1000000 * nsec;
y->tv_sec += nsec;
return x->tv_sec < y->tv_sec;
}
-/* add two struct timeval values */
-int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y)
+int timeval_add_time(struct timeval *result, long sec, long usec)
{
- result->tv_sec = x->tv_sec + y->tv_sec;
-
- result->tv_usec = x->tv_usec + y->tv_usec;
-
- while (result->tv_usec > 1000000)
- {
+ result->tv_sec += sec;
+ result->tv_usec += usec;
+
+ while (result->tv_usec > 1000000) {
result->tv_usec -= 1000000;
result->tv_sec++;
}
-
+
return 0;
}
-int timeval_add_time(struct timeval *result, int sec, int usec)
+int duration_start(struct duration *duration)
{
- result->tv_sec += sec;
- result->tv_usec += usec;
-
- while (result->tv_usec > 1000000)
- {
- result->tv_usec -= 1000000;
- result->tv_sec++;
- }
-
- return 0;
+ return gettimeofday(&duration->start, NULL);
+}
+
+int duration_measure(struct duration *duration)
+{
+ struct timeval end;
+ int retval = gettimeofday(&end, NULL);
+ if (0 == retval)
+ timeval_subtract(&duration->elapsed, &end, &duration->start);
+ return retval;
}
+float duration_elapsed(struct duration *duration)
+{
+ float t = duration->elapsed.tv_sec;
+ t += (float)duration->elapsed.tv_usec / 1000000.0;
+ return t;
+}
+
+float duration_kbps(struct duration *duration, size_t count)
+{
+ return count / (1024.0 * duration_elapsed(duration));
+}