#include "platform.h"
#include "gnunet_time_lib.h"
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+/**
+ * Variable used to simulate clock skew. Used for testing, never in production.
+ */
static long long timestamp_offset;
/**
* @param offset the offset to skew the locale time by
*/
void
-GNUNET_TIME_set_offset(long long offset)
+GNUNET_TIME_set_offset (long long offset)
{
timestamp_offset = offset;
}
GETTIMEOFDAY (&tv, NULL);
ret.abs_value =
- (uint64_t) (((uint64_t) tv.tv_sec * 1000LL) +
- ((uint64_t) tv.tv_usec / 1000LL)) + timestamp_offset;
+ (uint64_t) (((uint64_t) tv.tv_sec * 1000LL) +
+ ((uint64_t) tv.tv_usec / 1000LL)) + timestamp_offset;
return ret;
}
* Return relative time of 0ms.
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_zero ()
+GNUNET_TIME_relative_get_zero_ ()
{
static struct GNUNET_TIME_Relative zero;
+
return zero;
}
* Return absolute time of 0ms.
*/
struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get_zero ()
+GNUNET_TIME_absolute_get_zero_ ()
{
static struct GNUNET_TIME_Absolute zero;
+
return zero;
}
+
/**
* Return relative time of 1ms.
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_unit ()
+GNUNET_TIME_relative_get_unit_ ()
{
static struct GNUNET_TIME_Relative one = { 1 };
return one;
}
+
+/**
+ * Return relative time of 1s.
+ */
+struct GNUNET_TIME_Relative
+GNUNET_TIME_relative_get_second_ ()
+{
+ static struct GNUNET_TIME_Relative one = { 1000 };
+ return one;
+}
+
+
+/**
+ * Return relative time of 1 minute.
+ */
+struct GNUNET_TIME_Relative
+GNUNET_TIME_relative_get_minute_ ()
+{
+ static struct GNUNET_TIME_Relative one = { 60 * 1000 };
+ return one;
+}
+
+
+/**
+ * Return relative time of 1 hour.
+ */
+struct GNUNET_TIME_Relative
+GNUNET_TIME_relative_get_hour_ ()
+{
+ static struct GNUNET_TIME_Relative one = { 60 * 60 * 1000 };
+ return one;
+}
+
+
/**
* Return "forever".
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_get_forever ()
+GNUNET_TIME_relative_get_forever_ ()
{
static struct GNUNET_TIME_Relative forever = { UINT64_MAX };
return forever;
* Return "forever".
*/
struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_get_forever ()
+GNUNET_TIME_absolute_get_forever_ ()
{
static struct GNUNET_TIME_Absolute forever = { UINT64_MAX };
return forever;
GNUNET_TIME_relative_to_absolute (struct GNUNET_TIME_Relative rel)
{
struct GNUNET_TIME_Absolute ret;
+
if (rel.rel_value == UINT64_MAX)
- return GNUNET_TIME_absolute_get_forever ();
+ return GNUNET_TIME_UNIT_FOREVER_ABS;
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+
if (rel.rel_value + now.abs_value < rel.rel_value)
- {
- GNUNET_break (0); /* overflow... */
- return GNUNET_TIME_absolute_get_forever ();
- }
+ {
+ GNUNET_break (0); /* overflow... */
+ return GNUNET_TIME_UNIT_FOREVER_ABS;
+ }
ret.abs_value = rel.rel_value + now.abs_value;
return ret;
}
* @return timestamp that is smaller
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_min (struct
- GNUNET_TIME_Relative
- t1, struct GNUNET_TIME_Relative t2)
+GNUNET_TIME_relative_min (struct GNUNET_TIME_Relative t1,
+ struct GNUNET_TIME_Relative t2)
{
return (t1.rel_value < t2.rel_value) ? t1 : t2;
}
* @return timestamp that is larger
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_relative_max (struct
- GNUNET_TIME_Relative
- t1, struct GNUNET_TIME_Relative t2)
+GNUNET_TIME_relative_max (struct GNUNET_TIME_Relative t1,
+ struct GNUNET_TIME_Relative t2)
{
return (t1.rel_value > t2.rel_value) ? t1 : t2;
}
* @return timestamp that is smaller
*/
struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_min (struct
- GNUNET_TIME_Absolute
- t1, struct GNUNET_TIME_Absolute t2)
+GNUNET_TIME_absolute_min (struct GNUNET_TIME_Absolute t1,
+ struct GNUNET_TIME_Absolute t2)
{
return (t1.abs_value < t2.abs_value) ? t1 : t2;
}
*
* @param t1 first timestamp
* @param t2 other timestamp
- * @return timestamp that is smaller
+ * @return timestamp that is bigger
*/
struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_max (struct
- GNUNET_TIME_Absolute
- t1, struct GNUNET_TIME_Absolute t2)
+GNUNET_TIME_absolute_max (struct GNUNET_TIME_Absolute t1,
+ struct GNUNET_TIME_Absolute t2)
{
return (t1.abs_value > t2.abs_value) ? t1 : t2;
}
GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future)
{
struct GNUNET_TIME_Relative ret;
+
if (future.abs_value == UINT64_MAX)
- return GNUNET_TIME_relative_get_forever ();
+ return GNUNET_TIME_UNIT_FOREVER_REL;
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+
if (now.abs_value > future.abs_value)
- return GNUNET_TIME_relative_get_zero ();
+ return GNUNET_TIME_UNIT_ZERO;
ret.rel_value = future.abs_value - now.abs_value;
return ret;
}
struct GNUNET_TIME_Absolute end)
{
struct GNUNET_TIME_Relative ret;
+
if (end.abs_value == UINT64_MAX)
- return GNUNET_TIME_relative_get_forever ();
+ return GNUNET_TIME_UNIT_FOREVER_REL;
if (end.abs_value < start.abs_value)
- return GNUNET_TIME_relative_get_zero ();
+ return GNUNET_TIME_UNIT_ZERO;
ret.rel_value = end.abs_value - start.abs_value;
return ret;
}
now = GNUNET_TIME_absolute_get ();
GNUNET_assert (whence.abs_value != UINT64_MAX);
if (whence.abs_value > now.abs_value)
- return GNUNET_TIME_relative_get_zero ();
+ return GNUNET_TIME_UNIT_ZERO;
ret.rel_value = now.abs_value - whence.abs_value;
return ret;
}
{
struct GNUNET_TIME_Absolute ret;
- if ((start.abs_value == UINT64_MAX) ||
- (duration.rel_value == UINT64_MAX))
- return GNUNET_TIME_absolute_get_forever ();
+ if ((start.abs_value == UINT64_MAX) || (duration.rel_value == UINT64_MAX))
+ return GNUNET_TIME_UNIT_FOREVER_ABS;
if (start.abs_value + duration.rel_value < start.abs_value)
- {
- GNUNET_break (0);
- return GNUNET_TIME_absolute_get_forever ();
- }
+ {
+ GNUNET_break (0);
+ return GNUNET_TIME_UNIT_FOREVER_ABS;
+ }
ret.abs_value = start.abs_value + duration.rel_value;
return ret;
}
* @param duration some relative time to subtract
* @return ZERO if start <= duration, or FOREVER if start time is FOREVER; start-duration otherwise
*/
-struct GNUNET_TIME_Absolute
-GNUNET_TIME_absolute_subtract (struct
- GNUNET_TIME_Absolute
- start,
- struct
- GNUNET_TIME_Relative
- duration)
+struct GNUNET_TIME_Absolute
+GNUNET_TIME_absolute_subtract (struct GNUNET_TIME_Absolute start,
+ struct GNUNET_TIME_Relative duration)
{
struct GNUNET_TIME_Absolute ret;
+
if (start.abs_value <= duration.rel_value)
return GNUNET_TIME_UNIT_ZERO_ABS;
if (start.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)
unsigned int factor)
{
struct GNUNET_TIME_Relative ret;
+
if (factor == 0)
- return GNUNET_TIME_relative_get_zero ();
+ return GNUNET_TIME_UNIT_ZERO;
ret.rel_value = rel.rel_value * (unsigned long long) factor;
if (ret.rel_value / factor != rel.rel_value)
- {
- GNUNET_break (0);
- return GNUNET_TIME_relative_get_forever ();
- }
+ {
+ GNUNET_break (0);
+ return GNUNET_TIME_UNIT_FOREVER_REL;
+ }
return ret;
}
*/
struct GNUNET_TIME_Relative
GNUNET_TIME_relative_divide (struct GNUNET_TIME_Relative rel,
- unsigned int factor)
+ unsigned int factor)
{
struct GNUNET_TIME_Relative ret;
- if ( (factor == 0) ||
- (rel.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value) )
+
+ if ((factor == 0) ||
+ (rel.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value))
return GNUNET_TIME_UNIT_FOREVER_REL;
ret.rel_value = rel.rel_value / (unsigned long long) factor;
return ret;
/**
- * Calculate the estimate time of arrival/completion
+ * Calculate the estimate time of arrival/completion
* for an operation.
*
* @param start when did the operation start?
* assuming it continues at the same speed
*/
struct GNUNET_TIME_Relative
-GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start,
- uint64_t finished, uint64_t total)
+GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start, uint64_t finished,
+ uint64_t total)
{
struct GNUNET_TIME_Relative dur;
double exp;
struct GNUNET_TIME_Relative ret;
if ((a1.rel_value == UINT64_MAX) || (a2.rel_value == UINT64_MAX))
- return GNUNET_TIME_relative_get_forever ();
+ return GNUNET_TIME_UNIT_FOREVER_REL;
if (a1.rel_value + a2.rel_value < a1.rel_value)
- {
- GNUNET_break (0);
- return GNUNET_TIME_relative_get_forever ();
- }
+ {
+ GNUNET_break (0);
+ return GNUNET_TIME_UNIT_FOREVER_REL;
+ }
ret.rel_value = a1.rel_value + a2.rel_value;
return ret;
}
*/
struct GNUNET_TIME_Relative
GNUNET_TIME_relative_subtract (struct GNUNET_TIME_Relative a1,
- struct GNUNET_TIME_Relative a2)
+ struct GNUNET_TIME_Relative a2)
{
struct GNUNET_TIME_Relative ret;
if (a2.rel_value >= a1.rel_value)
- return GNUNET_TIME_relative_get_zero ();
- if (a1.rel_value == UINT64_MAX)
- return GNUNET_TIME_relative_get_forever ();
+ return GNUNET_TIME_UNIT_ZERO;
+ if (a1.rel_value == UINT64_MAX)
+ return GNUNET_TIME_UNIT_FOREVER_REL;
ret.rel_value = a1.rel_value - a2.rel_value;
return ret;
}
GNUNET_TIME_relative_hton (struct GNUNET_TIME_Relative a)
{
struct GNUNET_TIME_RelativeNBO ret;
+
ret.rel_value__ = GNUNET_htonll (a.rel_value);
return ret;
}
+
/**
* Convert relative time from network byte order.
*
GNUNET_TIME_relative_ntoh (struct GNUNET_TIME_RelativeNBO a)
{
struct GNUNET_TIME_Relative ret;
+
ret.rel_value = GNUNET_ntohll (a.rel_value__);
return ret;
}
+
/**
* Convert absolute time to network byte order.
*
GNUNET_TIME_absolute_hton (struct GNUNET_TIME_Absolute a)
{
struct GNUNET_TIME_AbsoluteNBO ret;
+
ret.abs_value__ = GNUNET_htonll (a.abs_value);
return ret;
}
+
/**
* Convert absolute time from network byte order.
*
GNUNET_TIME_absolute_ntoh (struct GNUNET_TIME_AbsoluteNBO a)
{
struct GNUNET_TIME_Absolute ret;
+
ret.abs_value = GNUNET_ntohll (a.abs_value__);
return ret;
}
-/**
- * Convert a relative time to a string.
- * This is one of the very few calls in the entire API that is
- * NOT reentrant!
- *
- * @param time the time to print
- *
- * @return string form of the time (as milliseconds)
- */
-const char *
-GNUNET_TIME_relative_to_string (struct GNUNET_TIME_Relative time)
-{
- static char time_string[21];
- memset(time_string, 0, sizeof(time_string));
-
- sprintf(time_string, "%llu", (unsigned long long) time.rel_value);
- return (const char *) time_string;
-}
-
-
/* end of time.c */
projects / oweals / gnunet.git / blobdiff