1 files changed, 30 insertions, 26 deletions

diff --git a/src/org/gnunet/util/RelativeTime.java b/src/org/gnunet/util/RelativeTime.java
index 7b45bb0..0faedfc 100644
--- a/src/org/gnunet/util/RelativeTime.java
+++ b/src/org/gnunet/util/RelativeTime.java
@@ -32,7 +32,8 @@ public final class RelativeTime implements Comparable<RelativeTime> {
     private static final Logger logger = LoggerFactory
             .getLogger(RelativeTime.class);
 
-    public static final RelativeTime MILLISECOND = new RelativeTime(1);
+    public static final RelativeTime MICROSECOND = new RelativeTime(1);
+    public static final RelativeTime MILLISECOND = MICROSECOND.multiply(1000);
     public static final RelativeTime SECOND = MILLISECOND.multiply(1000);
     public static final RelativeTime MINUTE = SECOND.multiply(60);
     public static final RelativeTime HOUR = MINUTE.multiply(60);
@@ -44,7 +45,10 @@ public final class RelativeTime implements Comparable<RelativeTime> {
     public static final RelativeTime ZERO = new RelativeTime(0);
     public static final RelativeTime FOREVER = new RelativeTime(Long.MAX_VALUE);
 
-    private final long rel_value;
+    /**
+     * Time offset in microseconds.
+     */
+    private final long rel_value_us;
 
     /**
      * Create a new RelativeTime value, with a given time in milliseconds.
@@ -52,7 +56,7 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * @param abs_value time in milliseconds
      */
     public RelativeTime(final long abs_value) {
-        this.rel_value = abs_value;
+        this.rel_value_us = abs_value;
     }
 
     /**
@@ -64,13 +68,13 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * @return this + other
      */
     public RelativeTime add(final RelativeTime other) {
-        if (this.rel_value == Long.MAX_VALUE
-                || other.rel_value == Long.MAX_VALUE) {
+        if (this.rel_value_us == Long.MAX_VALUE
+                || other.rel_value_us == Long.MAX_VALUE) {
             return RelativeTime.FOREVER;
         }
-        final long new_rel_value = this.rel_value + other.rel_value;
+        final long new_rel_value = this.rel_value_us + other.rel_value_us;
         // check for numeric overflow
-        if (new_rel_value < this.rel_value) {
+        if (new_rel_value < this.rel_value_us) {
             logger.warn("time overflow");
             return RelativeTime.FOREVER;
         }
@@ -85,10 +89,10 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * @return FOREVER if this=FOREVER or factor=0; otherwise this/factor
      */
     public RelativeTime divide(final int factor) {
-        if (factor == 0 || this.rel_value == Long.MAX_VALUE) {
+        if (factor == 0 || this.rel_value_us == Long.MAX_VALUE) {
             return RelativeTime.FOREVER;
         }
-        return new RelativeTime(this.rel_value / factor);
+        return new RelativeTime(this.rel_value_us / factor);
     }
 
     /**
@@ -96,8 +100,8 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * 
      * @return the amount of time in milliseconds
      */
-    public long getMilliseconds() {
-        return rel_value;
+    public long getMicroseconds() {
+        return rel_value_us;
     }
 
     /**
@@ -106,7 +110,7 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * @return max(t1, t2)
      */
     public static RelativeTime max(RelativeTime t1, RelativeTime t2) {
-        return t1.rel_value >= t2.rel_value ? t1 : t2;
+        return t1.rel_value_us >= t2.rel_value_us ? t1 : t2;
     }
 
     /**
@@ -115,7 +119,7 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      * @return min(this, other)
      */
     public static RelativeTime min(RelativeTime t1, RelativeTime t2) {
-        return t1.rel_value <= t2.rel_value ? t1 : t2;
+        return t1.rel_value_us <= t2.rel_value_us ? t1 : t2;
     }
 
     /**
@@ -127,9 +131,9 @@ public final class RelativeTime implements Comparable<RelativeTime> {
         if (factor == 0) {
             return RelativeTime.ZERO;
         }
-        final long ret = this.rel_value * factor;
+        final long ret = this.rel_value_us * factor;
         // check for numeric overflow
-        if (ret / factor != rel_value) {
+        if (ret / factor != rel_value_us) {
             logger.warn("time overflow");
             return RelativeTime.FOREVER;
         }
@@ -145,12 +149,12 @@ public final class RelativeTime implements Comparable<RelativeTime> {
      *         this=FOREVER, this-other otherwise
      */
     public RelativeTime subtract(final RelativeTime other) {
-        if (this.rel_value >= other.rel_value) {
+        if (this.rel_value_us >= other.rel_value_us) {
             return RelativeTime.ZERO;
-        } else if (this.rel_value == Long.MAX_VALUE) {
+        } else if (this.rel_value_us == Long.MAX_VALUE) {
             return this;
         } else {
-            return new RelativeTime(this.rel_value - other.rel_value);
+            return new RelativeTime(this.rel_value_us - other.rel_value_us);
         }
     }
 
@@ -165,24 +169,24 @@ public final class RelativeTime implements Comparable<RelativeTime> {
     }
 
     public boolean isForever() {
-        return rel_value == FOREVER.rel_value;
+        return rel_value_us == FOREVER.rel_value_us;
     }
 
     public boolean equals(Object o) {
-        return (o instanceof RelativeTime) && ((RelativeTime) o).rel_value == rel_value;
+        return (o instanceof RelativeTime) && ((RelativeTime) o).rel_value_us == rel_value_us;
     }
 
     @Override
     public int hashCode() {
-        return (int) this.rel_value;
+        return (int) this.rel_value_us;
     }
 
     @Override
     public int compareTo(RelativeTime other) {
-        if (this.rel_value < other.rel_value) {
+        if (this.rel_value_us < other.rel_value_us) {
             return -1;
         }
-        if (this.rel_value > other.rel_value) {
+        if (this.rel_value_us > other.rel_value_us) {
             return 1;
         }
         return 0;
@@ -193,16 +197,16 @@ public final class RelativeTime implements Comparable<RelativeTime> {
         if (this.isForever()) {
             return "RelativeTime(FOREVER)";
         }
-        return "RelativeTime("+this.rel_value+")";
+        return "RelativeTime("+this.rel_value_us +")";
     }
 
 
 
 
     public RelativeTimeMessage toNetwork() {
-        long rval = this.rel_value;
+        long rval = this.rel_value_us;
         assert rval >= 0;
-        if (rval == FOREVER.rel_value) {
+        if (rval == FOREVER.rel_value_us) {
             rval = -1L; /* 0xFFFFFFFFFFFFFFFF for network format! */
         }
         return new RelativeTimeMessage(rval);