-fixing speedup test

2 files changed, 66 insertions, 54 deletions

diff --git a/src/util/speedup.c b/src/util/speedup.c
index 6a17f3132..0a005c035 100644
--- a/src/util/speedup.c
+++ b/src/util/speedup.c
@@ -29,25 +29,26 @@
 
 #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;
   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 %llu ms\n", delta.rel_value);
   speedup_task = GNUNET_SCHEDULER_add_delayed (interval, &do_speedup, NULL);
 }
 
@@ -60,21 +61,20 @@ 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) || (0 == delta.rel_value))
   {
     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 time %llu ms every %llu ms\n",
+       delta.rel_value, interval.rel_value);
   speedup_task = GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO, &do_speedup, NULL);
   return GNUNET_OK;
 }
 
+
 void
 GNUNET_SPEEDUP_stop_ ( )
 {
@@ -82,11 +82,9 @@ GNUNET_SPEEDUP_stop_ ( )
   {
     GNUNET_SCHEDULER_cancel (speedup_task);
     speedup_task = GNUNET_SCHEDULER_NO_TASK;
-
   }
-
   LOG (GNUNET_ERROR_TYPE_DEBUG,
-      "Stopped execution speed up\n");
+       "Stopped execution speed up\n");
 }
 
 
diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c
index 47603d35c..03cffbd54 100644
--- a/src/util/test_speedup.c
+++ b/src/util/test_speedup.c
@@ -27,36 +27,54 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_strings_lib.h"
 
-
-#define VERBOSE GNUNET_NO
-
+/**
+ * Start time of the testcase
+ */
 static struct GNUNET_TIME_Absolute start;
+
+/**
+ * End-time of the testcase (affected by speed-up)
+ */
 static struct GNUNET_TIME_Absolute end;
-static int cycles;
 
+/**
+ * Number of cycles we have spent in 'run'.
+ */
+static unsigned int cycles;
+
+
+/**
+ * Main task that is scheduled with the speed-up.
+ *
+ * @param cls NULL
+ * @param tc scheduler context, unused
+ */
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-
-  cycles ++;
-  printf ("..%u", cycles);
-  fflush(stdout);
+  cycles++;
+  fprintf (stderr, "..%u", cycles);
   if (cycles <= 5)
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &run, NULL);
-  else
   {
-    end = GNUNET_TIME_absolute_get();
-    printf ("\n");
-    fflush(stdout);
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &run, NULL);
+    return;
   }
+  end = GNUNET_TIME_absolute_get();
+  fprintf (stderr, "\n");
+  fflush(stdout);  
 }
 
-void check (void *cls, char *const *args,
-                                     const char *cfgfile,
-                                     const struct GNUNET_CONFIGURATION_Handle *
-                                     cfg)
+
+/**
+ *
+ */
+static void 
+check (void *cls, char *const *args,
+       const char *cfgfile,
+       const struct GNUNET_CONFIGURATION_Handle *
+       cfg)
 {
-  printf ("0");
+  fprintf (stderr, "0");
   fflush(stdout);
   GNUNET_SCHEDULER_add_now(&run, NULL);
 }
@@ -65,42 +83,38 @@ void check (void *cls, char *const *args,
 int
 main (int argc, char *argv[])
 {
-  time_t start_real;
-  time_t end_real;
-  struct GNUNET_TIME_Relative delta;
-
   static char *const argvn[] = { "test-speedup",
-    "-c",
-    "test_speedup_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
+    "-c",  "test_speedup_data.conf",
     NULL
   };
-  start_real = time (NULL);
-  start = GNUNET_TIME_absolute_get();
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-
+  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);
 
-  if (delta.rel_value >  ((end_real - start_real) * 1500))
+  if (delta.rel_value >  ((end_real - start_real) * 1500LL))
   {
-    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG, "Execution time in GNUnet time: %llu ms\n", delta.rel_value);
-    GNUNET_log  (GNUNET_ERROR_TYPE_DEBUG, "Execution time in system time: %llu ms\n", (end_real - start_real) * 1000);
+    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", 
+                 (unsigned long long) ((end_real - start_real) * 1000LL));
     return 0;
   }
-  else
-  {
-    GNUNET_log  (GNUNET_ERROR_TYPE_ERROR, "Execution time in GNUnet time: %llu ms\n", delta.rel_value);
-    GNUNET_log  (GNUNET_ERROR_TYPE_ERROR, "Execution time in system time: %llu ms\n", (end_real - start_real) * 1000);
-    return 1;
-  }
+  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", 
+               (unsigned long long) ((end_real - start_real) * 1000LL));
+  return 1;
 }
 
 /* end of test_speedup.c */