tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / util / test_speedup.c

diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index 03cffbd54abd0d3b819afb6f1862f0a6bb3f212f..a46d83dc38dd76f777393f17ca4de3ccc529a510 100644 (file)
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -1,31 +1,28 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2006, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011-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 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file util/test_speedup.c
  * @brief testcase for speedup.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
  * Start time of the testcase
@@ -50,40 +47,43 @@ static unsigned int cycles;
  * @param tc scheduler context, unused
  */
 static void
-run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls)
 {
   cycles++;
   fprintf (stderr, "..%u", cycles);
   if (cycles <= 5)
   {
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &run, NULL);
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                 &run,
+                                 NULL);
     return;
   }
   end = GNUNET_TIME_absolute_get();
   fprintf (stderr, "\n");
-  fflush(stdout);  
+  fflush(stdout);
 }
 
 
 /**
  *
  */
-static void 
-check (void *cls, char *const *args,
+static void
+check (void *cls,
+       char *const *args,
        const char *cfgfile,
-       const struct GNUNET_CONFIGURATION_Handle *
-       cfg)
+       const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   fprintf (stderr, "0");
-  fflush(stdout);
-  GNUNET_SCHEDULER_add_now(&run, NULL);
+  fflush (stdout);
+  GNUNET_SCHEDULER_add_now (&run, NULL);
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  static char *const argvn[] = { "test-speedup",
+  static char *const argvn[] = {
+    "test-speedup",
     "-c",  "test_speedup_data.conf",
     NULL
   };
@@ -93,26 +93,30 @@ main (int argc, char *argv[])
   time_t start_real;
   time_t end_real;
   struct GNUNET_TIME_Relative delta;
-  
+
   start_real = time (NULL);
   start = GNUNET_TIME_absolute_get();
   GNUNET_PROGRAM_run ((sizeof (argvn) / sizeof (char *)) - 1, argvn, "test-speedup",
                       "nohelp", options, &check, NULL);
 
   end_real = time (NULL);
-  delta = GNUNET_TIME_absolute_get_difference(start, end);
+  delta = GNUNET_TIME_absolute_get_difference (start, end);
 
-  if (delta.rel_value >  ((end_real - start_real) * 1500LL))
+  if (delta.rel_value_us >  ((end_real - start_real) * 1500LL * 1000LL))
   {
-    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG, "Execution time in GNUnet time: %llu ms\n", 
-                (unsigned long long) delta.rel_value);
-    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG, "Execution time in system time: %llu ms\n", 
+    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG,
+                "Execution time in GNUnet time: %s\n",
+                GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_YES));
+    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG,
+                "Execution time in system time: %llu ms\n",
                 (unsigned long long) ((end_real - start_real) * 1000LL));
     return 0;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Execution time in GNUnet time: %llu ms\n", 
-             (unsigned long long) delta.rel_value);
-  GNUNET_log  (GNUNET_ERROR_TYPE_ERROR, "Execution time in system time: %llu ms\n", 
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+             "Execution time in GNUnet time: %s\n",
+             GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_YES));
+  GNUNET_log  (GNUNET_ERROR_TYPE_ERROR,
+              "Execution time in system time: %llu ms\n",
               (unsigned long long) ((end_real - start_real) * 1000LL));
   return 1;
 }