X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_time.c;h=d0aca21666885ef1979400e707184c4ff8b7ab00;hb=1ac9ef013b0e9c737d6909ab41a38b45a3d36e43;hp=8bc2c9123855cb8a7189c1d0f085a9ee4fc76108;hpb=7dcf37ac1b4955f3d5c66706be56d26b164b5853;p=oweals%2Fgnunet.git

diff --git a/src/util/test_time.c b/src/util/test_time.c
index 8bc2c9123..d0aca2166 100644
--- a/src/util/test_time.c
+++ b/src/util/test_time.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2006, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2001-2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -14,21 +14,19 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_time.c
  * @brief testcase for time.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
-#define VERBOSE GNUNET_NO
 
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_TIME_AbsoluteNBO nown;
@@ -42,105 +40,194 @@ check ()
   struct GNUNET_TIME_Relative relUnit;
   struct GNUNET_TIME_RelativeNBO reln;
   unsigned int i;
-  forever = GNUNET_TIME_absolute_get_forever ();
-  relForever = GNUNET_TIME_relative_get_forever ();
-  relUnit = GNUNET_TIME_relative_get_unit ();
-  zero.value = 0;
+
+  GNUNET_log_setup ("test-time", "WARNING", NULL);
+  forever = GNUNET_TIME_UNIT_FOREVER_ABS;
+  relForever = GNUNET_TIME_UNIT_FOREVER_REL;
+  relUnit = GNUNET_TIME_UNIT_MILLISECONDS;
+  zero.abs_value_us = 0;
 
   last = now = GNUNET_TIME_absolute_get ();
-  while (now.value == last.value)
+  while (now.abs_value_us == last.abs_value_us)
     now = GNUNET_TIME_absolute_get ();
-  GNUNET_assert (now.value > last.value);
+  GNUNET_assert (now.abs_value_us > last.abs_value_us);
 
   /* test overflow checking in multiply */
-  rel = GNUNET_TIME_UNIT_SECONDS;
+  rel = GNUNET_TIME_UNIT_MILLISECONDS;
   GNUNET_log_skip (1, GNUNET_NO);
   for (i = 0; i < 55; i++)
     rel = GNUNET_TIME_relative_multiply (rel, 2);
   GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (rel.value == GNUNET_TIME_UNIT_FOREVER_REL.value);
+  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
+  /*check zero */
+  rel.rel_value_us = (UINT64_MAX) - 1024;
+  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                 GNUNET_TIME_relative_multiply (rel, 0).rel_value_us);
 
   /* test infinity-check for relative to absolute */
+  GNUNET_log_skip (1, GNUNET_NO);
   last = GNUNET_TIME_relative_to_absolute (rel);
-  GNUNET_assert (last.value == GNUNET_TIME_UNIT_FOREVER_ABS.value);
-
+  GNUNET_assert (last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
+  GNUNET_log_skip (0, GNUNET_YES);
+
+  /* check relative to absolute */
+  rel.rel_value_us = 1000000;
+  GNUNET_assert (GNUNET_TIME_absolute_get ().abs_value_us <
+                 GNUNET_TIME_relative_to_absolute (rel).abs_value_us);
+  /*check forever */
+  rel.rel_value_us = UINT64_MAX;
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us ==
+                 GNUNET_TIME_relative_to_absolute (rel).abs_value_us);
   /* check overflow for r2a */
-  rel.value = ((uint64_t) - 1LL) - 1024;
+  rel.rel_value_us = (UINT64_MAX) - 1024;
   GNUNET_log_skip (1, GNUNET_NO);
   last = GNUNET_TIME_relative_to_absolute (rel);
   GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (last.value == GNUNET_TIME_UNIT_FOREVER_ABS.value);
+  GNUNET_assert (last.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us);
 
   /* check overflow for relative add */
   GNUNET_log_skip (1, GNUNET_NO);
   rel = GNUNET_TIME_relative_add (rel, rel);
   GNUNET_log_skip (0, GNUNET_NO);
-  GNUNET_assert (rel.value == GNUNET_TIME_UNIT_FOREVER_REL.value);
+  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us);
 
-  GNUNET_assert (GNUNET_TIME_relative_add (relForever, relForever).value ==
-                 relForever.value);
-  GNUNET_assert (GNUNET_TIME_relative_add (relUnit, relUnit).value ==
-                 2 * relUnit.value);
+  GNUNET_log_skip (1, GNUNET_NO);
+  rel = GNUNET_TIME_relative_add (relForever, relForever);
+  GNUNET_log_skip (0, GNUNET_NO);
+  GNUNET_assert (rel.rel_value_us == relForever.rel_value_us);
+
+  GNUNET_log_skip (1, GNUNET_NO);
+  rel = GNUNET_TIME_relative_add (relUnit, relUnit);
+  GNUNET_assert (rel.rel_value_us == 2 * relUnit.rel_value_us);
 
   /* check relation check in get_duration */
-  future.value = now.value + 1000000;
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (now, future).value ==
+  future.abs_value_us = now.abs_value_us + 1000000;
+  GNUNET_assert (GNUNET_TIME_absolute_get_difference (now, future).rel_value_us ==
                  1000000);
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).value ==
+  GNUNET_assert (GNUNET_TIME_absolute_get_difference (future, now).rel_value_us ==
                  0);
 
-  GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).value ==
-                 forever.value);
+  GNUNET_assert (GNUNET_TIME_absolute_get_difference (zero, forever).rel_value_us
+                 == forever.abs_value_us);
 
-  past.value = now.value - 1000000;
+  past.abs_value_us = now.abs_value_us - 1000000;
   rel = GNUNET_TIME_absolute_get_duration (future);
-  GNUNET_assert (rel.value == 0);
+  GNUNET_assert (rel.rel_value_us == 0);
   rel = GNUNET_TIME_absolute_get_duration (past);
-  GNUNET_assert (rel.value >= 1000000);
+  GNUNET_assert (rel.rel_value_us >= 1000000);
 
   /* check get remaining */
   rel = GNUNET_TIME_absolute_get_remaining (now);
-  GNUNET_assert (rel.value == 0);
+  GNUNET_assert (rel.rel_value_us == 0);
   rel = GNUNET_TIME_absolute_get_remaining (past);
-  GNUNET_assert (rel.value == 0);
+  GNUNET_assert (rel.rel_value_us == 0);
   rel = GNUNET_TIME_absolute_get_remaining (future);
-  GNUNET_assert (rel.value > 0);
-  GNUNET_assert (rel.value <= 1000000);
+  GNUNET_assert (rel.rel_value_us > 0);
+  GNUNET_assert (rel.rel_value_us <= 1000000);
+  forever = GNUNET_TIME_UNIT_FOREVER_ABS;
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                 GNUNET_TIME_absolute_get_remaining (forever).rel_value_us);
 
   /* check endianess */
   reln = GNUNET_TIME_relative_hton (rel);
-  GNUNET_assert (rel.value == GNUNET_TIME_relative_ntoh (reln).value);
+  GNUNET_assert (rel.rel_value_us == GNUNET_TIME_relative_ntoh (reln).rel_value_us);
   nown = GNUNET_TIME_absolute_hton (now);
-  GNUNET_assert (now.value == GNUNET_TIME_absolute_ntoh (nown).value);
+  GNUNET_assert (now.abs_value_us == GNUNET_TIME_absolute_ntoh (nown).abs_value_us);
 
   /* check absolute addition */
   future = GNUNET_TIME_absolute_add (now, GNUNET_TIME_UNIT_SECONDS);
-  GNUNET_assert (future.value == now.value + 1000);
+  GNUNET_assert (future.abs_value_us == now.abs_value_us + 1000 * 1000LL);
 
   future = GNUNET_TIME_absolute_add (forever, GNUNET_TIME_UNIT_ZERO);
-  GNUNET_assert (future.value == forever.value);
+  GNUNET_assert (future.abs_value_us == forever.abs_value_us);
 
-  rel.value = ((uint64_t) - 1LL) - 1024;
-  now.value = rel.value;
+  rel.rel_value_us = (UINT64_MAX) - 1024;
+  now.abs_value_us = rel.rel_value_us;
   future = GNUNET_TIME_absolute_add (now, rel);
-  GNUNET_assert (future.value == forever.value);
+  GNUNET_assert (future.abs_value_us == forever.abs_value_us);
 
   /* check zero */
   future = GNUNET_TIME_absolute_add (now, GNUNET_TIME_UNIT_ZERO);
-  GNUNET_assert (future.value == now.value);
+  GNUNET_assert (future.abs_value_us == now.abs_value_us);
+
+  GNUNET_assert (forever.abs_value_us ==
+                 GNUNET_TIME_absolute_subtract (forever,
+                                                GNUNET_TIME_UNIT_MINUTES).abs_value_us);
+  /*check absolute subtract */
+  now.abs_value_us = 50000;
+  rel.rel_value_us = 100000;
+  GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
+                 (GNUNET_TIME_absolute_subtract (now, rel)).abs_value_us);
+  rel.rel_value_us = 10000;
+  GNUNET_assert (40000 == (GNUNET_TIME_absolute_subtract (now, rel)).abs_value_us);
+
+  /*check relative divide */
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                 (GNUNET_TIME_relative_divide (rel, 0)).rel_value_us);
+
+  rel = GNUNET_TIME_UNIT_FOREVER_REL;
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                 (GNUNET_TIME_relative_divide (rel, 2)).rel_value_us);
+
+  rel = GNUNET_TIME_relative_divide (relUnit, 2);
+  GNUNET_assert (rel.rel_value_us == relUnit.rel_value_us / 2);
+
+
+  /* check Return absolute time of 0ms */
+  zero = GNUNET_TIME_UNIT_ZERO_ABS;
+
+  /* check GNUNET_TIME_calculate_eta */
+  last.abs_value_us = GNUNET_TIME_absolute_get ().abs_value_us - 1024;
+  forever = GNUNET_TIME_UNIT_FOREVER_ABS;
+  forever.abs_value_us = forever.abs_value_us - 1024;
+  GNUNET_assert (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us ==
+                 GNUNET_TIME_calculate_eta (forever, 50000, 100000).rel_value_us);
+  /* check zero */
+  GNUNET_log_skip (1, GNUNET_NO);
+  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                 (GNUNET_TIME_calculate_eta (last, 60000, 50000)).rel_value_us);
+  GNUNET_log_skip (0, GNUNET_YES);
+  /*check forever */
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                 (GNUNET_TIME_calculate_eta (last, 0, 50000)).rel_value_us);
+
+  /*check relative subtract */
+  now = GNUNET_TIME_absolute_get ();
+  rel.rel_value_us = now.abs_value_us;
+  relForever.rel_value_us = rel.rel_value_us + 1024;
+  GNUNET_assert (1024 ==
+                 GNUNET_TIME_relative_subtract (relForever, rel).rel_value_us);
+  /*check zero */
+  GNUNET_assert (GNUNET_TIME_UNIT_ZERO.rel_value_us ==
+                 GNUNET_TIME_relative_subtract (rel, relForever).rel_value_us);
+  /*check forever */
+  rel.rel_value_us = UINT64_MAX;
+  GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us ==
+                 GNUNET_TIME_relative_subtract (rel, relForever).rel_value_us);
+
+  /*check GNUNET_TIME_relative_min */
+  now = GNUNET_TIME_absolute_get ();
+  rel.rel_value_us = now.abs_value_us;
+  relForever.rel_value_us = rel.rel_value_us - 1024;
+  GNUNET_assert (relForever.rel_value_us ==
+                 GNUNET_TIME_relative_min (rel, relForever).rel_value_us);
+
+  /*check GNUNET_TIME_relative_max */
+  GNUNET_assert (rel.rel_value_us ==
+                 GNUNET_TIME_relative_max (rel, relForever).rel_value_us);
+
+  /*check GNUNET_TIME_absolute_min */
+  now = GNUNET_TIME_absolute_get ();
+  last.abs_value_us = now.abs_value_us - 1024;
+  GNUNET_assert (last.abs_value_us ==
+                 GNUNET_TIME_absolute_min (now, last).abs_value_us);
+
+  /*check  GNUNET_TIME_absolute_max */
+  GNUNET_assert (now.abs_value_us ==
+                 GNUNET_TIME_absolute_max (now, last).abs_value_us);
 
   return 0;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret;
-
-  GNUNET_log_setup ("test-time", "WARNING", NULL);
-  ret = check ();
-
-  return ret;
-}
 
 /* end of test_time.c */