Merge branch 'master' of ssh://gnunet.org/gnunet

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

diff --git a/src/util/speedup.c b/src/util/speedup.c
index a42ed7faf18dc6514beed38f05807c88cab613ac..c6a4cf67859bfaeaf9595ee85e41b875e3fa5509 100644 (file)
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -27,31 +27,30 @@
 #include "gnunet_util_lib.h"
 #include "speedup.h"
 
-#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG(kind,...) GNUNET_log_from (kind, "util-speedup", __VA_ARGS__)
 
 
 static struct GNUNET_TIME_Relative interval;
 
 static struct GNUNET_TIME_Relative delta;
 
-static struct GNUNET_SCHEDULER_Task * speedup_task;
+static struct GNUNET_SCHEDULER_Task *speedup_task;
 
 
 static void
-do_speedup (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_speedup (void *cls)
 {
   static long long current_offset;
 
   speedup_task = NULL;
-  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
-    return;
   current_offset += delta.rel_value_us;
   GNUNET_TIME_set_offset (current_offset);
   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);
+  speedup_task = GNUNET_SCHEDULER_add_delayed (interval,
+                                              &do_speedup,
+                                              NULL);
 }
 
 
@@ -64,16 +63,22 @@ do_speedup (void *cls,
 int
 GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  GNUNET_assert (NULL == speedup_task);
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (cfg, "testing",
-                                           "SPEEDUP_INTERVAL", &interval))
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                          "testing",
+                                           "SPEEDUP_INTERVAL",
+                                          &interval))
     return GNUNET_SYSERR;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (cfg, "testing",
-                                           "SPEEDUP_DELTA", &delta))
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                          "testing",
+                                           "SPEEDUP_DELTA",
+                                          &delta))
     return GNUNET_SYSERR;
 
-  if ((0 == interval.rel_value_us) || (0 == delta.rel_value_us))
+  if ( (0 == interval.rel_value_us) ||
+       (0 == delta.rel_value_us) )
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Speed up disabled\n");
@@ -86,7 +91,8 @@ GNUNET_SPEEDUP_start_ (const struct GNUNET_CONFIGURATION_Handle *cfg)
        "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);
+                                                         &do_speedup,
+                                                        NULL);
   return GNUNET_OK;
 }
 
@@ -108,6 +114,4 @@ GNUNET_SPEEDUP_stop_ ()
         "Stopped execution speed up\n");
 }
 
-
-
 /* end of speedup.c */