Commit 09679e9f8b17760043ca4b54b3c762c261f6b2d2

Con Kolivas 2013-08-19T17:38:20

Provide a timeval_to_cgtime helper function to reuse values.

diff --git a/util.c b/util.c
index 95419c5..6e82ab7 100644
--- a/util.c
+++ b/util.c
@@ -812,6 +812,11 @@ void cgtime(struct timeval *tv)
 {
 	gettimeofday(tv, NULL);
 }
+
+void timeval_to_cgtimer(cgtimer_t *cgt, const struct timeval *tv)
+{
+	timeval_to_spec(cgt, tv);
+}
 #else
 static void dtime_to_timeval(struct timeval *tv, DWORD dtime)
 {
@@ -830,6 +835,16 @@ void cgtime(struct timeval *tv)
 	//timeEndPeriod(1);
 	dtime_to_timeval(tv, dtime);
 }
+
+static void timeval_to_dtime(DWORD *dtime, const struct timeval *tv)
+{
+	*dtime = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+}
+
+void timeval_to_cgtimer(cgtimer_t *cgt, const struct timeval *tv)
+{
+	timeval_to_dtime(cgt, tv);
+}
 #endif
 
 void subtime(struct timeval *a, struct timeval *b)
diff --git a/util.h b/util.h
index ed1f57f..35a267e 100644
--- a/util.h
+++ b/util.h
@@ -75,6 +75,7 @@ void thr_info_cancel(struct thr_info *thr);
 void nmsleep(unsigned int msecs);
 void nusleep(unsigned int usecs);
 void cgtime(struct timeval *tv);
+void timeval_to_cgtimer(cgtimer_t *cgt, const struct timeval *tv);
 void subtime(struct timeval *a, struct timeval *b);
 void addtime(struct timeval *a, struct timeval *b);
 bool time_more(struct timeval *a, struct timeval *b);