X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=tv.c;h=8ab5e5a90a6bd151c87750adb761c135b7ec774e;hp=b0acc79c30a58ca0843bbe5c8956dd038d8bcdc5;hb=dead9f9151ae2cf14c45e87742284e165976e8c0;hpb=46cbddf465bd66ba1d5c4bcc780ae0d65abd7f73

diff --git a/tv.c b/tv.c
index b0acc79..8ab5e5a 100644
--- a/tv.c
+++ b/tv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -14,42 +14,7 @@
 #include "err.h"
 #include "str.h"
 #include "log.h"
-
-/**
- * Convert struct timeval to milliseconds.
- *
- * \param tv The time value value to convert.
- *
- * \return The number off milliseconds in \a tv.
- */
-long unsigned tv2ms(const struct timeval *tv)
-{
-	return tv->tv_sec * 1000 + (tv->tv_usec + 500)/ 1000;
-}
-
-/**
- * Convert milliseconds to a struct timeval.
- *
- * \param n The number of milliseconds.
- * \param tv Result pointer.
- */
-void ms2tv(long unsigned n, struct timeval *tv)
-{
-	tv->tv_sec = n / 1000;
-	tv->tv_usec = (n % 1000) * 1000;
-}
-
-/**
- * Convert a double to a struct timeval.
- *
- * \param x The value to convert.
- * \param tv Result pointer.
- */
-void d2tv(double x, struct timeval *tv)
-{
-	tv->tv_sec = x;
-	tv->tv_usec = (x - (double)tv->tv_sec) * 1000.0 * 1000.0 + 0.5;
-}
+#include "time.h"
 
 /**
  * Compute the difference of two time values.
@@ -85,60 +50,10 @@ int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *di
 	return ret;
 }
 
-/**
- * Add two time values.
- *
- * \param a First addend.
- * \param b Second addend.
- * \param sum Contains the sum \a + \a b on return.
- */
-void tv_add(const struct timeval *a, const struct timeval *b,
-	struct timeval *sum)
-{
-	sum->tv_sec = a->tv_sec + b->tv_sec;
-	if (a->tv_usec + b->tv_usec >= 1000 * 1000) {
-		sum->tv_sec++;
-		sum->tv_usec = a->tv_usec + b->tv_usec - 1000 * 1000;
-	} else
-		sum->tv_usec = a->tv_usec + b->tv_usec;
-}
-
-/**
- * Compute integer multiple of given struct timeval.
- *
- * \param mult The integer value to multiply with.
- * \param tv The timevalue to multiply.
- *
- * \param result Contains \a mult * \a tv on return.
- */
-void tv_scale(const unsigned long mult, const struct timeval *tv,
-	struct timeval *result)
-{
-	result->tv_sec = mult * tv->tv_sec;
-	result->tv_sec += tv->tv_usec * mult / 1000 / 1000;
-	result->tv_usec = tv->tv_usec * mult % (1000 * 1000);
-}
-
-/**
- * Compute a fraction of given struct timeval.
- *
- * \param divisor The integer value to divide by.
- * \param tv The timevalue to divide.
- * \param result Contains (1 / mult) * tv on return.
- */
-void tv_divide(const unsigned long divisor, const struct timeval *tv,
-	struct timeval *result)
-{
-	uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) / divisor;
-
-	result->tv_sec = x / 1000 / 1000;
-	result->tv_usec = x % (1000 * 1000);
-}
-
 int64_t get_current_time(void)
 {
 	time_t now;
 	time(&now);
-	DSS_DEBUG_LOG("now: %jd\n", (intmax_t)now);
+	DSS_DEBUG_LOG(("now: %jd\n", (intmax_t)now));
 	return (int64_t)now;
 }