- test for external iterator

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

diff --git a/src/util/speedup.c b/src/util/speedup.c
index 6a17f3132c3e15b6a40a512a462a62294de0479b..2482decea4c51bcfae4de51c4eec85c233f48910 100644 (file)
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2006, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2011-2013 Christian Grothoff (and other contributing authors)
 
      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
@@ -24,34 +24,41 @@
  * @brief functions to speedup peer execution by manipulation system time
  */
 #include "platform.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
 
-static long long current_offset;
+
 static struct GNUNET_TIME_Relative interval;
+
 static struct GNUNET_TIME_Relative delta;
 
 static GNUNET_SCHEDULER_TaskIdentifier speedup_task;
 
+
 static void
 do_speedup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  static long long current_offset;
+ 
   speedup_task = GNUNET_SCHEDULER_NO_TASK;
-
   if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
     return;
-
-  current_offset += delta.rel_value;
+  current_offset += delta.rel_value_us;
   GNUNET_TIME_set_offset (current_offset);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Speed up execution time by %llu ms\n", delta.rel_value);
-
+  LOG (GNUNET_ERROR_TYPE_DEBUG, 
+       "Speeding up execution time by %s\n", 
+       GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_NO));
   speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL);
 }
 
 
+/**
+ * Start task that may speed up our system clock artificially
+ *
+ * @param cfg configuration to use
+ * @return GNUNET_OK on success, GNUNET_SYSERR if the speedup was not configured
+ */
 int
 GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
@@ -60,21 +67,26 @@ GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SPEEDUP_DELTA", &delta))
     return GNUNET_SYSERR;
 
-  if ((interval.rel_value == 0) || (delta.rel_value == 0))
+  if ((0 == interval.rel_value_us) || (0 == delta.rel_value_us))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-      "Speed up disabled\n");
+        "Speed up disabled\n");
     return GNUNET_OK;
   }
-
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-    "Speed up execution time %llu ms every %llu ms\n",
-    delta.rel_value, interval.rel_value);
-
+       "Speed up execution by %s\n",
+       GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_NO));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Speed up executed every %s\n",
+       GNUNET_STRINGS_relative_time_to_string (interval, GNUNET_NO));
   speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &do_speedup, NULL);
   return GNUNET_OK;
 }
 
+
+/**
+ * Stop tasks that modify clock behavior.
+ */
 void
 GNUNET_SPEEDUP_stop_ ( )
 {
@@ -82,11 +94,11 @@ GNUNET_SPEEDUP_stop_ ( )
   {
     GNUNET_SCHEDULER_cancel (speedup_task);
     speedup_task = GNUNET_SCHEDULER_NO_TASK;
-
   }
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-      "Stopped execution speed up\n");
+  if ( (0 != interval.rel_value_us) && 
+       (0 != delta.rel_value_us) )
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+        "Stopped execution speed up\n");
 }