X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=time.c;h=c405351a96f978c39b18ec0466a65fad012aff26;hp=6e1d603d2751566f3afa55d518367e162ae1b06b;hb=bd10c0f46e0b7eadfb8c6d5cd45581cec253d775;hpb=002731cd3938f3be6b71651e56c062af1adcdec0

diff --git a/time.c b/time.c
index 6e1d603d..c405351a 100644
--- a/time.c
+++ b/time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,7 +12,7 @@
  *
  * \param tv The time value value to convert.
  *
- * \return The number off milliseconds in \a tv.
+ * \return The number of milliseconds in \a tv.
  */
 long unsigned tv2ms(const struct timeval *tv)
 {
@@ -55,7 +55,8 @@ void d2tv(double x, struct timeval *tv)
  *
  * \return If \a b < \a a, this function returns -1, otherwise it returns 1.
  */
-int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *diff)
+int tv_diff(const struct timeval *b, const struct timeval *a,
+		struct timeval *diff)
 {
 	int ret = 1;
 
@@ -82,10 +83,10 @@ int tv_diff(const struct timeval *b, const struct timeval *a, struct timeval *di
  *
  * \param a First addend.
  * \param b Second addend.
- * \param sum Contains the sum \a + \a b on return.
+ * \param sum Contains the sum \a a + \a b on return.
  */
 void tv_add(const struct timeval *a, const struct timeval *b,
-	struct timeval *sum)
+		struct timeval *sum)
 {
 	sum->tv_sec = a->tv_sec + b->tv_sec;
 	if (a->tv_usec + b->tv_usec >= 1000 * 1000) {
@@ -104,11 +105,12 @@ void tv_add(const struct timeval *a, const struct timeval *b,
  * \param result Contains \a mult * \a tv on return.
  */
 void tv_scale(const unsigned long mult, const struct timeval *tv,
-	struct timeval *result)
+		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);
+	uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) * mult;
+
+	result->tv_sec = x / 1000 / 1000;
+	result->tv_usec = x % (1000 * 1000);
 }
 
 /**
@@ -119,7 +121,7 @@ void tv_scale(const unsigned long mult, const struct timeval *tv,
  * \param result Contains (1 / mult) * tv on return.
  */
 void tv_divide(const unsigned long divisor, const struct timeval *tv,
-	struct timeval *result)
+		struct timeval *result)
 {
 	uint64_t x = ((uint64_t)tv->tv_sec * 1000 * 1000 + tv->tv_usec) / divisor;
 
@@ -130,43 +132,44 @@ void tv_divide(const unsigned long divisor, const struct timeval *tv,
 /**
  * Compute a convex combination of two time values.
  *
- * \param a The first coefiicent.
+ * \param a The first coefficient.
  * \param tv1 The first time value.
- * \param b The second coefiicent.
+ * \param b The second coefficient.
  * \param tv2 The second time value.
  * \param result Contains the convex combination upon return.
  *
- * compute x := (a * tv1 + b * tv2) / (|a| + |b|) and store |x| in \a result.
+ * Compute x := (a * tv1 + b * tv2) / (|a| + |b|) and store |x| in \a result.
  * Both \a a and \a b may be negative.
  *
- * \return One if \a x is positive, -1 otherwise.
+ * \return Zero, 1 or -1, if \a x is zero, positive or negative, respectively.
  */
 int tv_convex_combination(const long a, const struct timeval *tv1,
 		const long b, const struct timeval *tv2,
 		struct timeval *result)
 {
 	struct timeval tmp1, tmp2, tmp3;
-	int ret = 1, subtract = ((a > 0 && b < 0) || (a < 0 && b > 0));
-	unsigned long a1 = PARA_ABS(a), b1 = PARA_ABS(b);
+	int ret = 1;
+	unsigned long a1, b1;
 
+	if (a == 0 && b == 0) {
+		result->tv_sec = 0;
+		result->tv_usec = 0;
+		return 0;
+	}
+	a1 = PARA_ABS(a);
+	b1 = PARA_ABS(b);
 	tv_scale(a1, tv1, &tmp1);
 	tv_scale(b1, tv2, &tmp2);
-	if (subtract)
+	if ((a > 0 && b < 0) || (a < 0 && b > 0)) /* subtract */
 		ret = tv_diff(&tmp1, &tmp2, &tmp3);
 	else
 		tv_add(&tmp1, &tmp2, &tmp3);
-	if (a1 + b1)
-		tv_divide(a1 + b1, &tmp3, result);
-	else {
-		result->tv_sec = 0;
-		result->tv_usec = 0;
-	}
+	tv_divide(a1 + b1, &tmp3, result);
 	if (!a || !b) {
 		if (a + b < 0)
 			ret = -1;
-	} else
-		if (a < 0)
-			ret = -ret;
+	} else if (a < 0)
+		ret = -ret;
 	return ret;
 }
 
@@ -178,7 +181,7 @@ int tv_convex_combination(const long a, const struct timeval *tv1,
  * \param stream_start When the first chunk was sent.
  * \param result The time when to send chunk number \a chunk_num.
  *
- * This function computes stream_start + chunk_num * chunk_time.
+ * This function computes \a stream_start + \a chunk_num * \a chunk_time.
  */
 void compute_chunk_time(long unsigned chunk_num,
 		struct timeval *chunk_tv, struct timeval *stream_start,
@@ -189,3 +192,40 @@ void compute_chunk_time(long unsigned chunk_num,
 	tv_scale(chunk_num, chunk_tv, &tmp);
 	tv_add(&tmp, stream_start, result);
 }
+
+/**
+ * Retrieve the time of the realtime clock.
+ *
+ * \param tv Where to store the result.
+ *
+ * Gets the current value of the system-wide real-time clock (identified by id
+ * \p CLOCK_REALTIME). If \a tv is \p NULL, the value is stored in a static
+ * buffer, otherwise it is stored at the location given by \a tv.
+ *
+ * \return This function aborts on errors. On success it returns a pointer to
+ * memory containing the current time.
+ *
+ * \sa clock_gettime(2), gettimeofday(2).
+ */
+struct timeval *clock_get_realtime(struct timeval *tv)
+{
+	static struct timeval user_friendly;
+
+	if (!tv)
+		tv = &user_friendly;
+#ifdef HAVE_CLOCK_GETTIME
+	{
+		struct timespec t;
+		int ret;
+
+		ret = clock_gettime(CLOCK_REALTIME, &t);
+		assert(ret == 0);
+		tv->tv_sec = t.tv_sec;
+		tv->tv_usec = t.tv_nsec / 1000;
+	}
+#else
+	#include <sys/time.h>
+	gettimeofday(tv, NULL);
+#endif /* HAVE_CLOCK_GETTIME */
+	return tv;
+}