SHUTDOWN

[oweals/gnunet.git] / src / include / gnunet_time_lib.h

diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 8336a04fd17879a8cc4c7a3bd07a312495459c88..4f0b3b74c3a3a1254b5b77230d4dbd15fd203dd1 100644 (file)
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -46,7 +46,7 @@ struct GNUNET_TIME_Absolute
   /**
    * The actual value.
    */
-  uint64_t value;
+  uint64_t abs_value;
 };
 
 /**
@@ -58,7 +58,7 @@ struct GNUNET_TIME_Relative
   /**
    * The actual value.
    */
-  uint64_t value;
+  uint64_t rel_value;
 };
 
 
@@ -70,7 +70,7 @@ struct GNUNET_TIME_RelativeNBO
   /**
    * The actual value (in network byte order).
    */
-  uint64_t value__ GNUNET_PACKED;
+  uint64_t rel_value__ GNUNET_PACKED;
 };
 
 
@@ -82,7 +82,7 @@ struct GNUNET_TIME_AbsoluteNBO
   /**
    * The actual value (in network byte order).
    */
-  uint64_t value__ GNUNET_PACKED;
+  uint64_t abs_value__ GNUNET_PACKED;
 };
 
 
@@ -204,6 +204,20 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_min (struct
                                                      struct
                                                      GNUNET_TIME_Relative t2);
 
+
+/**
+ * Return the maximum of two relative time values.
+ *
+ * @param t1 first timestamp
+ * @param t2 other timestamp
+ * @return timestamp that is larger
+ */
+struct GNUNET_TIME_Relative GNUNET_TIME_relative_max (struct
+                                                     GNUNET_TIME_Relative
+                                                     t1,
+                                                     struct
+                                                     GNUNET_TIME_Relative t2);
+
 /**
  * Return the minimum of two absolute time values.
  *
@@ -300,6 +314,22 @@ struct GNUNET_TIME_Absolute GNUNET_TIME_absolute_add (struct
                                                       GNUNET_TIME_Relative
                                                       duration);
 
+
+/**
+ * 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);
+
 /**
  * Multiply relative time by a given factor.
  *
@@ -313,6 +343,19 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_multiply (struct
                                                            unsigned int
                                                            factor);
 
+/**
+ * Divide relative time by a given factor.
+ *
+ * @param rel some duration
+ * @param factor integer to divide by
+ * @return FOREVER if rel=FOREVER or factor==0; otherwise rel/factor
+ */
+struct GNUNET_TIME_Relative GNUNET_TIME_relative_divide (struct
+                                                        GNUNET_TIME_Relative
+                                                        rel,
+                                                        unsigned int
+                                                        factor);
+
 /**
  * Add relative times together.
  *
@@ -326,6 +369,17 @@ struct GNUNET_TIME_Relative GNUNET_TIME_relative_add (struct
                                                       GNUNET_TIME_Relative
                                                       a2);
 
+/**
+ * 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);
+
 
 /**
  * Convert relative time to network byte order.