struct GNUNET_TIME_Relative
GNUNET_TIME_relative_get_forever ()
{
- static struct GNUNET_TIME_Relative forever = { (uint64_t) - 1LL };
+ static struct GNUNET_TIME_Relative forever = { UINT64_MAX };
return forever;
}
struct GNUNET_TIME_Absolute
GNUNET_TIME_absolute_get_forever ()
{
- static struct GNUNET_TIME_Absolute forever = { (uint64_t) - 1LL };
+ 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.value == (uint64_t) - 1LL)
+ if (rel.value == UINT64_MAX)
return GNUNET_TIME_absolute_get_forever ();
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
if (rel.value + now.value < rel.value)
GNUNET_TIME_absolute_get_remaining (struct GNUNET_TIME_Absolute future)
{
struct GNUNET_TIME_Relative ret;
- if (future.value == (uint64_t) - 1LL)
+ if (future.value == UINT64_MAX)
return GNUNET_TIME_relative_get_forever ();
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
if (now.value > future.value)
struct GNUNET_TIME_Absolute end)
{
struct GNUNET_TIME_Relative ret;
- if (end.value == (uint64_t) - 1LL)
+ if (end.value == UINT64_MAX)
return GNUNET_TIME_relative_get_forever ();
if (end.value < start.value)
return GNUNET_TIME_relative_get_zero ();
struct GNUNET_TIME_Relative ret;
now = GNUNET_TIME_absolute_get ();
- GNUNET_assert (hence.value != (uint64_t) - 1LL);
+ GNUNET_assert (hence.value != UINT64_MAX);
if (hence.value > now.value)
return GNUNET_TIME_relative_get_zero ();
ret.value = now.value - hence.value;
{
struct GNUNET_TIME_Absolute ret;
- if ((start.value == (uint64_t) - 1LL) ||
- (duration.value == (uint64_t) - 1LL))
+ if ((start.value == UINT64_MAX) ||
+ (duration.value == UINT64_MAX))
return GNUNET_TIME_absolute_get_forever ();
if (start.value + duration.value < start.value)
{
return ret;
}
+
+/**
+ * Subtract a given relative duration from the
+ * given start time.
+ *
+ * @param start some absolute time
+ * @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 ret;
+ if (start.value <= duration.value)
+ return GNUNET_TIME_UNIT_ZERO_ABS;
+ if (start.value == GNUNET_TIME_UNIT_FOREVER_ABS.value)
+ return GNUNET_TIME_UNIT_FOREVER_ABS;
+ ret.value = start.value - duration.value;
+ return ret;
+}
+
+
/**
* Multiply relative time by a given factor.
*
/**
* Add relative times together.
*
+ * @param a1 first timestamp
+ * @param a2 second timestamp
* @return FOREVER if either argument is FOREVER or on overflow; a1+a2 otherwise
*/
struct GNUNET_TIME_Relative
{
struct GNUNET_TIME_Relative ret;
- if ((a1.value == (uint64_t) - 1LL) || (a2.value == (uint64_t) - 1LL))
+ if ((a1.value == UINT64_MAX) || (a2.value == UINT64_MAX))
return GNUNET_TIME_relative_get_forever ();
if (a1.value + a2.value < a1.value)
{
}
+/**
+ * Subtract relative timestamp from the other.
+ *
+ * @param a1 first timestamp
+ * @param a2 second timestamp
+ * @return ZERO if a2>=a1 (including both FOREVER), FOREVER if a1 is FOREVER, a1-a2 otherwise
+ */
+struct GNUNET_TIME_Relative
+GNUNET_TIME_relative_subtract (struct GNUNET_TIME_Relative a1,
+ struct GNUNET_TIME_Relative a2)
+{
+ struct GNUNET_TIME_Relative ret;
+
+ if (a2.value >= a1.value)
+ return GNUNET_TIME_relative_get_zero ();
+ if (a1.value == UINT64_MAX)
+ return GNUNET_TIME_relative_get_forever ();
+ ret.value = a1.value - a2.value;
+ return ret;
+}
+
+
/**
* Convert relative time to network byte order.
+ *
+ * @param a time to convert
+ * @return time in network byte order
*/
struct GNUNET_TIME_RelativeNBO
GNUNET_TIME_relative_hton (struct GNUNET_TIME_Relative a)
/**
* Convert relative time from network byte order.
+ *
+ * @param a time to convert
+ * @return time in host byte order
*/
struct GNUNET_TIME_Relative
GNUNET_TIME_relative_ntoh (struct GNUNET_TIME_RelativeNBO a)
/**
* Convert absolute time to network byte order.
+ *
+ * @param a time to convert
+ * @return time in network byte order
*/
struct GNUNET_TIME_AbsoluteNBO
GNUNET_TIME_absolute_hton (struct GNUNET_TIME_Absolute a)
/**
* Convert absolute time from network byte order.
+ *
+ * @param a time to convert
+ * @return time in host byte order
*/
struct GNUNET_TIME_Absolute
GNUNET_TIME_absolute_ntoh (struct GNUNET_TIME_AbsoluteNBO a)